From d64a90207ed8e6080144ef7d54868af6f36e5224 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Thu, 12 Jun 2025 07:38:17 -0500 Subject: [PATCH] nix: drop llvmPackages2 was trying to fix llvm build, turned out to be oom with too-small WSL vm --- default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/default.nix b/default.nix index 1dde39a5..0266939d 100644 --- a/default.nix +++ b/default.nix @@ -42,16 +42,13 @@ let # Choose the LLVM version you want llvmPackages1 = super.llvmPackages_18; - llvmPackages2 = llvmPackages1 // { llvm = llvmPackages1.llvm.overrideAttrs (old: { - cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_VERBOSE_MAKEFILE=1" ]; - }); }; in let # on darwin, rebuild stdenv to use clang tied to that LLVM version. # otherwise we get conflicts since darwin stdenv is using clang+llvm for gcc. # - clangStdenv = super.overrideCC super.stdenv llvmPackages2.clang; + clangStdenv = super.overrideCC super.stdenv llvmPackages1.clang; # stdenv to use for xo-jit jitStdenv = if super.stdenv.isDarwin then clangStdenv else super.stdenv; @@ -101,14 +98,14 @@ let xo-jit = self.callPackage pkgs/xo-jit.nix { #stdenv = jitStdenv; #clang = llvmPackages2.clang; - llvm = llvmPackages2.llvm; }; + llvm = llvmPackages1.llvm; }; xo-pyjit = self.callPackage pkgs/xo-pyjit.nix {}; # xo-userenv = self.callPackage pkgs/xo-userenv.nix {}; xo-userenv-slow = self.callPackage pkgs/xo-userenv-slow.nix { stdenv = jitStdenv; #clang = llvmPackages.clang; - llvm = llvmPackages2.llvm; + llvm = llvmPackages1.llvm; }; llvmXo = llvmXo; };