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

nix: build with default stdenv
2020-10-15 12:42:30 +02:00
parent bbd0e25d64 85e0d375cf
commit ee813768c0
1 changed files with 0 additions and 3 deletions
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -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 {