From 3e6713db0601329de91b7c3258c9f31d6c52a9dc Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 17 Nov 2007 14:35:02 +0000 Subject: [PATCH] Removed stdenvUsingSetupNew2; now stdenvNewSetupScript = stdenv svn path=/nixpkgs/branches/stdenv-updates/; revision=9740 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6b48e09050..edb9de934b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -244,8 +244,6 @@ rec { } else defaultStdenv; - stdenvUsingSetupNew2 = overrideSetup stdenv ../stdenv/generic/setup-new-2.sh; - ### BUILD SUPPORT @@ -294,7 +292,7 @@ rec { writeScript = name: text: runCommand name {inherit text;} "echo -n \"$text\" > $out; chmod +x $out"; - stdenvNewSetupScript = overrideSetup stdenv ../stdenv/generic/setup-new.sh; + stdenvNewSetupScript = stdenv; substituteAll = import ../build-support/substitute/substitute-all.nix { inherit stdenv;