diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-08-27 14:56:59 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-08-27 14:56:59 +0000 |
| commit | fc980b49f901209634891e09e41e03bfec4c7768 (patch) | |
| tree | f1f957c9c8b18a2c4bc5efe3469546ea088756f0 | |
| parent | 86173ade50c313eeeae4c687c308633ca0f2751c (diff) | |
| download | nixlib-fc980b49f901209634891e09e41e03bfec4c7768.tar nixlib-fc980b49f901209634891e09e41e03bfec4c7768.tar.gz nixlib-fc980b49f901209634891e09e41e03bfec4c7768.tar.bz2 nixlib-fc980b49f901209634891e09e41e03bfec4c7768.tar.lz nixlib-fc980b49f901209634891e09e41e03bfec4c7768.tar.xz nixlib-fc980b49f901209634891e09e41e03bfec4c7768.tar.zst nixlib-fc980b49f901209634891e09e41e03bfec4c7768.zip | |
* Test setting $sourceRoot directly.
svn path=/nixpkgs/trunk/; revision=12746
| -rw-r--r-- | pkgs/tools/text/convertlit/default.nix | 2 | ||||
| -rw-r--r-- | 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 |