summary refs log tree commit diff
path: root/pkgs/tools/package-management/nix
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-04-22 21:16:59 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2019-04-26 21:55:01 -0400
commitc72c6a48ca2c3090ea94df4474695524b5e68f9c (patch)
treebe1edf7f7c154f5387c59993b8c4f7e9ae83aaeb /pkgs/tools/package-management/nix
parentffeffb3851fa0e53e248ec93b977098826514bad (diff)
downloadnixpkgs-c72c6a48ca2c3090ea94df4474695524b5e68f9c.tar
nixpkgs-c72c6a48ca2c3090ea94df4474695524b5e68f9c.tar.gz
nixpkgs-c72c6a48ca2c3090ea94df4474695524b5e68f9c.tar.bz2
nixpkgs-c72c6a48ca2c3090ea94df4474695524b5e68f9c.tar.lz
nixpkgs-c72c6a48ca2c3090ea94df4474695524b5e68f9c.tar.xz
nixpkgs-c72c6a48ca2c3090ea94df4474695524b5e68f9c.tar.zst
nixpkgs-c72c6a48ca2c3090ea94df4474695524b5e68f9c.zip
treewide: use llvm6 in some places
Not everything works on llvm7. It’s easiest to just provide the llvm6
as backup in this case.
Diffstat (limited to 'pkgs/tools/package-management/nix')
-rw-r--r--pkgs/tools/package-management/nix/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 7590a37a8e3..ca1a38c4ab4 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -3,6 +3,7 @@
 , stateDir ? "/nix/var"
 , confDir ? "/etc"
 , boehmgc
+, llvmPackages_6
 }:
 
 let
@@ -174,6 +175,8 @@ in rec {
     };
 
     inherit storeDir stateDir confDir boehmgc;
+
+    stdenv = llvmPackages_6.stdenv;
   };
 
   nixUnstable = lib.lowPrio (callPackage common rec {
@@ -188,6 +191,8 @@ in rec {
     fromGit = true;
 
     inherit storeDir stateDir confDir boehmgc;
+
+    stdenv = llvmPackages_6.stdenv;
   });
 
 }