[WIP]

runtimeverification · Nov 26, 2020 · 5fc0180 · 5fc0180
1 parent c9fe638
commit 5fc0180
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/default.nix b/default.nix
@@ -25,8 +25,7 @@ let
       llvmPackages.lldClangNoLibcxx.override override;
 
   llvm-backend = callPackage ./nix/llvm-backend.nix {
-    inherit (llvmPackages) llvm;
-    inherit clang;
+    inherit llvmPackages;
   };
 
   mavenix = import sources."mavenix" { inherit pkgs; };

diff --git a/nix/llvm-backend.nix b/nix/llvm-backend.nix
@@ -1,11 +1,12 @@
 {
-  lib, stdenv, nix-gitignore,
+  lib, nix-gitignore,
   cmake, flex, pkgconfig,
-  llvm, clang,
+  llvmPackages,
   boost, gmp, jemalloc, libffi, libyaml, mpfr,
 }:
 
 let inherit (nix-gitignore) gitignoreSourcePure; in
+let inherit (llvmPackages) stdenv llvm; in
 
 let
   pname = "llvm-backend";
@@ -31,12 +32,12 @@ stdenv.mkDerivation {
       ]
       ./..;
 
-  nativeBuildInputs = [ cmake clang flex llvm pkgconfig ];
+  nativeBuildInputs = [ cmake flex llvm pkgconfig ];
   buildInputs = [ boost gmp libffi libyaml jemalloc mpfr ];
 
   cmakeFlags = [
-    ''-DCMAKE_C_COMPILER=${lib.getBin clang}/bin/cc''
-    ''-DCMAKE_CXX_COMPILER=${lib.getBin clang}/bin/c++''
+    ''-DCMAKE_C_COMPILER=${lib.getBin stdenv.cc}/bin/cc''
+    ''-DCMAKE_CXX_COMPILER=${lib.getBin stdenv.cc}/bin/c++''
     ''-DNIX=TRUE''
   ];
   NIX_CFLAGS_COMPILE = [ "-Wno-error" ];