diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-07-14 09:28:09 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-07-14 09:28:09 +0000 |
| commit | 10d67f5c7a45460d03116b506de72ed8c7990e25 (patch) | |
| tree | 4bcc720064000e9d66ff7f418823ec393baf67f6 /pkgs/stdenv/nix | |
| parent | b2f6e204a28fe55677887a4aeb0c3707bad36b45 (diff) | |
| download | nixlib-10d67f5c7a45460d03116b506de72ed8c7990e25.tar nixlib-10d67f5c7a45460d03116b506de72ed8c7990e25.tar.gz nixlib-10d67f5c7a45460d03116b506de72ed8c7990e25.tar.bz2 nixlib-10d67f5c7a45460d03116b506de72ed8c7990e25.tar.lz nixlib-10d67f5c7a45460d03116b506de72ed8c7990e25.tar.xz nixlib-10d67f5c7a45460d03116b506de72ed8c7990e25.tar.zst nixlib-10d67f5c7a45460d03116b506de72ed8c7990e25.zip | |
* Reviving stdenvNix.
svn path=/nixpkgs/trunk/; revision=5702
Diffstat (limited to 'pkgs/stdenv/nix')
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 6bcc366a51df..34109e2dbc79 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,4 +1,4 @@ -{stdenv, pkgs, genericStdenv, gccWrapper}: +{stdenv, pkgs, genericStdenv}: genericStdenv { name = "stdenv-nix"; @@ -7,12 +7,12 @@ genericStdenv { inherit stdenv; - gcc = gccWrapper { - name = pkgs.gcc.name; + gcc = import ../../build-support/gcc-wrapper { nativeTools = false; nativeGlibc = true; - inherit (pkgs) gcc binutils; inherit stdenv; + inherit (pkgs) binutils; + gcc = pkgs.gcc.gcc; shell = pkgs.bash ~ /bin/sh; }; |