summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-04-26 22:20:03 -0400
committerGitHub <noreply@github.com>2019-04-26 22:20:03 -0400
commit87944c3125c4e69a69e76003c0ed5bf47bf0c4d8 (patch)
tree6c6e4f084e2ed6567719d44b4dd377829cd2c6f8 /pkgs/tools/package-management
parent1cf626ce29f154c5742196327e03dbd61d0ed988 (diff)
parentc1f1a0ea159a4513be524fa775ad708debd19aa1 (diff)
Merge pull request #56744 from matthewbauer/macos-10-12
Update macOS to 10.12
Diffstat (limited to 'pkgs/tools/package-management')
-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 7590a37a8e36..ca1a38c4ab48 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;
});
}