From fc980b49f901209634891e09e41e03bfec4c7768 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Aug 2008 14:56:59 +0000
Subject: [PATCH] * Test setting $sourceRoot directly.

svn path=/nixpkgs/trunk/; revision=12746
---
 pkgs/tools/text/convertlit/default.nix | 2 +-
 pkgs/top-level/all-packages.nix        | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix
index 4a758626929d..02654cd89228 100644
--- a/pkgs/tools/text/convertlit/default.nix
+++ b/pkgs/tools/text/convertlit/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   buildInputs = [unzip libtommath];
 
-  setSourceRoot = "sourceRoot=.";
+  sourceRoot = ".";
 
   buildPhase = ''
     cd lib
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 756039d723bf..2d3c80d2a576 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -566,8 +566,9 @@ let
   };
 
   convertlit = import ../tools/text/convertlit {
-    inherit fetchurl stdenv unzip libtommath;
- };
+    inherit fetchurl unzip libtommath;
+    stdenv = stdenvNew;
+  };
 
   coreutils = useFromStdenv "coreutils"
     ((if stdenv ? isDietLibC