public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Matthew Bauer 2019-04-29 21:30:56 -04:00
parent 74c784a79c
commit c82bb3133c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/package-management/nix/default.nix
View File

@ -3,7 +3,7 @@
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
, confDir ? "/etc" , confDir ? "/etc"
, boehmgc , boehmgc
, llvmPackages_6 , stdenv, llvmPackages_6
}: }:
let let
@ -167,7 +167,7 @@ in rec {
inherit storeDir stateDir confDir boehmgc; inherit storeDir stateDir confDir boehmgc;
}; };
nixStable = callPackage common rec { nixStable = callPackage common (rec {
name = "nix-2.2.2"; name = "nix-2.2.2";
src = fetchurl { src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
@ -175,9 +175,9 @@ in rec {
}; };
inherit storeDir stateDir confDir boehmgc; inherit storeDir stateDir confDir boehmgc;
} // stdenv.lib.optionalAttrs stdenv.cc.isClang {
stdenv = llvmPackages_6.stdenv; stdenv = llvmPackages_6.stdenv;
}; });
nixUnstable = lib.lowPrio (callPackage common rec { nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-2.3${suffix}"; name = "nix-2.3${suffix}";
@ -191,8 +191,6 @@ in rec {
fromGit = true; fromGit = true;
inherit storeDir stateDir confDir boehmgc; inherit storeDir stateDir confDir boehmgc;
stdenv = llvmPackages_6.stdenv;
}); });
} }