Merge pull request #188924 from McSinyx/klee-llvm

klee: use the same LLVM version for clang

pkgs/applications/science/logic/klee/default.nix

@@ -1,9 +1,10 @@
 { lib
+, stdenv
 , callPackage
 , fetchFromGitHub
 , cmake
-, llvmPackages_11
 , clang
+, llvm
 , python3
 , zlib
 , z3
@@ -35,18 +36,14 @@
 }:
 
 let
-
   # Python used for KLEE tests.
   kleePython = python3.withPackages (ps: with ps; [ tabulate ]);
 
   # The klee-uclibc derivation.
   kleeuClibc = callPackage ./klee-uclibc.nix {
-    inherit clang llvmPackages_11 extraKleeuClibcConfig debugRuntime runtimeAsserts;
+    inherit stdenv clang llvm extraKleeuClibcConfig debugRuntime runtimeAsserts;
   };
-
-in
-clang.stdenv.mkDerivation rec {
-
+in stdenv.mkDerivation rec {
   pname = "klee";
   version = "2.3";
 
@@ -61,7 +58,7 @@ clang.stdenv.mkDerivation rec {
     cryptominisat
     gperftools
     lit # Configure phase checking for lit
-    llvmPackages_11.llvm
+    llvm
     sqlite
     stp
     z3

pkgs/applications/science/logic/klee/klee-uclibc.nix

@@ -1,10 +1,11 @@
 { lib
+, stdenv
 , fetchurl
 , fetchFromGitHub
 , which
 , linuxHeaders
 , clang
-, llvmPackages_11
+, llvm
 , python3
 , curl
 , debugRuntime ? true
@@ -23,8 +24,7 @@ let
     "RUNTIME_PREFIX" = "/";
     "DEVEL_PREFIX" = "/";
   });
-in
-clang.stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
   pname = "klee-uclibc";
   version = "1.3";
   src = fetchFromGitHub {
@@ -37,7 +37,7 @@ clang.stdenv.mkDerivation rec {
   nativeBuildInputs = [
     clang
     curl
-    llvmPackages_11.llvm
+    llvm
     python3
     which
   ];

pkgs/top-level/all-packages.nix

@@ -28999,7 +28999,11 @@ with pkgs;
 
   klayout = libsForQt5.callPackage ../applications/misc/klayout { };
 
-  klee = callPackage ../applications/science/logic/klee { };
+  klee = callPackage ../applications/science/logic/klee (with llvmPackages_11; {
+    clang = clang;
+    llvm = llvm;
+    stdenv = stdenv;
+  });
 
   kmetronome = libsForQt5.callPackage ../applications/audio/kmetronome { };