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
commit ee813768c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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