diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-29 21:30:56 -0400 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-29 21:34:24 -0400 |
commit | c82bb3133cba555d9a61ddcca1d58f770e02efaa (patch) | |
tree | 14527a0d230aabc110777cd366496f084ab3763a /pkgs/tools/package-management/nix | |
parent | 74c784a79c6908c14c0c13d6c34db93d9a4d2c8d (diff) | |
download | nixlib-c82bb3133cba555d9a61ddcca1d58f770e02efaa.tar nixlib-c82bb3133cba555d9a61ddcca1d58f770e02efaa.tar.gz nixlib-c82bb3133cba555d9a61ddcca1d58f770e02efaa.tar.bz2 nixlib-c82bb3133cba555d9a61ddcca1d58f770e02efaa.tar.lz nixlib-c82bb3133cba555d9a61ddcca1d58f770e02efaa.tar.xz nixlib-c82bb3133cba555d9a61ddcca1d58f770e02efaa.tar.zst nixlib-c82bb3133cba555d9a61ddcca1d58f770e02efaa.zip |
nix: use llvm6 on clang
nix-2.2.2 only works with libcxx 6. We should only set the stdenv to clang when we are already using clang. Also, nixUnstable does support libcxx 7.
Diffstat (limited to 'pkgs/tools/package-management/nix')
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ca1a38c4ab48..6d0e07d60f98 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -3,7 +3,7 @@ , stateDir ? "/nix/var" , confDir ? "/etc" , boehmgc -, llvmPackages_6 +, stdenv, llvmPackages_6 }: let @@ -167,7 +167,7 @@ in rec { inherit storeDir stateDir confDir boehmgc; }; - nixStable = callPackage common rec { + nixStable = callPackage common (rec { name = "nix-2.2.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; @@ -175,9 +175,9 @@ in rec { }; inherit storeDir stateDir confDir boehmgc; - + } // stdenv.lib.optionalAttrs stdenv.cc.isClang { stdenv = llvmPackages_6.stdenv; - }; + }); nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.3${suffix}"; @@ -191,8 +191,6 @@ in rec { fromGit = true; inherit storeDir stateDir confDir boehmgc; - - stdenv = llvmPackages_6.stdenv; }); } |