Add FileCheck for LLVM lit

alpmestan · Apr 18, 2023 · 03abaf2 · 03abaf2
1 parent f81cce1
commit 03abaf2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/ghc.nix b/ghc.nix
@@ -73,8 +73,8 @@ let
       ps = if crossTarget == null then pkgs else pkgs-cross.buildPackages;
     in
     if lib.versionAtLeast version "9.1"
-    then ps.llvm_12
-    else ps.llvm_9;
+    then ps.llvmPackages_12
+    else ps.llvmPackages_9;
 
   stdenv =
     if useClang
@@ -117,7 +117,7 @@ let
       hlint
     ]
     ++ docsPackages
-    ++ optional withLlvm llvmForGhc
+    ++ optional withLlvm llvmForGhc.llvm
     ++ optional withGrind valgrind
     ++ optional withEMSDK emscripten
     ++ optional withNuma numactl
@@ -126,7 +126,7 @@ let
     ++ optional withIde (pkgs-unstable.haskell-language-server.override { supportedGhcVersions = [ (builtins.replaceStrings [ "." ] [ "" ] ghc.version) ]; })
     ++ optional withIde clang-tools # N.B. clang-tools for clangd
     ++ optional withDtrace linuxPackages.systemtap
-    ++ optional withLlvmLit lit
+    ++ optionals withLlvmLit [ lit llvmForGhc.libllvm ]
     ++ optional withQEMU qemu
     ++ (if (! stdenv.isDarwin)
     then [ pxz ]