From 85e0d375cfe3c9cd354e312df99a7c3df114a3e7 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 15 Oct 2020 16:03:04 +0900 Subject: [PATCH] nix: build with default stdenv This was required for Nix v2.2.2 which did not build with libcxx 7. This is no longer required for any current version of Nix. --- pkgs/tools/package-management/nix/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2acf5d194e0..e843e655300 100644 --- 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 {