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

Merge pull request #100558 from thefloweringash/nix-default-stdenv 

nix: build with default stdenv
This commit is contained in:
Eelco Dolstra 2020-10-15 12:42:30 +02:00 committed by GitHub
parent bbd0e25d64 85e0d375cf
commit ee813768c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
, confDir ? "/etc" , confDir ? "/etc"
, boehmgc , boehmgc
, stdenv, llvmPackages_6
}: }:
let let
@ -190,8 +189,6 @@ in rec {
}; };
inherit storeDir stateDir confDir boehmgc; inherit storeDir stateDir confDir boehmgc;
} // stdenv.lib.optionalAttrs stdenv.cc.isClang {
stdenv = llvmPackages_6.stdenv;
}); });
nixUnstable = lib.lowPrio (callPackage common rec { nixUnstable = lib.lowPrio (callPackage common rec {