public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Reviving stdenvNix.

Browse Source 
svn path=/nixpkgs/trunk/; revision=5702
This commit is contained in:
Eelco Dolstra 2006-07-14 09:28:09 +00:00
parent b2f6e204a2
commit 10d67f5c7a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/stdenv/default.nix
View File

@ -39,8 +39,11 @@ rec {
# The Nix build environment. # The Nix build environment.
stdenvNix = (import ./nix) { stdenvNix = (import ./nix) {
stdenv = stdenvNative; stdenv = stdenvNative;
pkgs = stdenvNativePkgs; pkgs = allPackages {
inherit genericStdenv gccWrapper; bootStdenv = removeAttrs stdenvNative ["gcc"]; # Hack
noSysDirs = false;
};
inherit genericStdenv;
}; };

8
pkgs/stdenv/nix/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, pkgs, genericStdenv, gccWrapper}: {stdenv, pkgs, genericStdenv}:
genericStdenv { genericStdenv {
name = "stdenv-nix"; name = "stdenv-nix";
@ -7,12 +7,12 @@ genericStdenv {
inherit stdenv; inherit stdenv;
gcc = gccWrapper { gcc = import ../../build-support/gcc-wrapper {
name = pkgs.gcc.name;
nativeTools = false; nativeTools = false;
nativeGlibc = true; nativeGlibc = true;
inherit (pkgs) gcc binutils;
inherit stdenv; inherit stdenv;
inherit (pkgs) binutils;
gcc = pkgs.gcc.gcc;
shell = pkgs.bash ~ /bin/sh; shell = pkgs.bash ~ /bin/sh;
}; };