From 59ea75d88e1d3145267470f492d063c2a31fc9cc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 22 Feb 2008 03:08:26 +0000
Subject: [PATCH] !!! Important notice. This commit should be already done at
 the time of nixpkgs-stdenv-updates-merge going to trunk. This commit should
 be reverted if you are using old nixpkgs trunk. I hope there will be no
 commits to nixos/ before merger...

svn path=/nixos/trunk/; revision=10824
---
 upstart-jobs/httpd.nix       | 2 +-
 upstart-jobs/ircd-hybrid.nix | 2 +-
 upstart-jobs/xserver.nix     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix
index 88eee31926f..1a10f5444d6 100644
--- a/upstart-jobs/httpd.nix
+++ b/upstart-jobs/httpd.nix
@@ -23,7 +23,7 @@ let
   
   webServer = import ../../services/apache-httpd {
     inherit (pkgs) apacheHttpd coreutils;
-    stdenv = pkgs.stdenvNewSetupScript;
+    stdenv = pkgs.stdenv;
     php = if cfg.mod_php then pkgs.php else null;
     tomcat_connectors = if cfg.mod_jk.enable then pkgs.tomcat_connectors else null;
 
diff --git a/upstart-jobs/ircd-hybrid.nix b/upstart-jobs/ircd-hybrid.nix
index ce2d5ba7fca..5c117ae55a3 100644
--- a/upstart-jobs/ircd-hybrid.nix
+++ b/upstart-jobs/ircd-hybrid.nix
@@ -2,7 +2,7 @@
 let
 	cfg = config.services.ircdHybrid;
 	ircdService = import ../services/ircd-hybrid {
-		stdenv = pkgs.stdenvNewSetupScript;
+		stdenv = pkgs.stdenv;
 		inherit (pkgs) ircdHybrid coreutils 
 			su iproute gnugrep procps;
 		serverName = cfg.serverName;
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index ffcd6485762..2852f23666a 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -12,7 +12,7 @@ let
   cfg = config.services.xserver;
   xorg = pkgs.xorg;
   gnome = pkgs.gnome;
-  stdenv = pkgs.stdenvNewSetupScript;
+  stdenv = pkgs.stdenv;
 
   # Get a bunch of user settings.
   videoDriver = cfg.videoDriver;