diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-11 17:26:14 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-11 17:26:14 +0000 |
| commit | de13527000165c566e47d2146a1a6480fc67da59 (patch) | |
| tree | 12f84ad99f15678dde1c6282ed78db37e776914a /pkgs/stdenv/nix | |
| parent | a1b3ae0c8121b932beeceb46bef816bdb2a9f180 (diff) | |
* Finally got stdenv-nix-linux working again. Still not perfect,
though.
* libxml2: upgrade to latest.
* octavefront/rna: keep debug info.
svn path=/nixpkgs/trunk/; revision=830
Diffstat (limited to 'pkgs/stdenv/nix')
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/stdenv/nix/prehook.sh | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 2c5c70eb2bd0..5d454e26ce78 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,13 +1,19 @@ -{bootStdenv, pkgs}: (import ../generic) { +{stdenv, pkgs}: + +(import ../generic) { name = "stdenv-nix"; - system = bootStdenv.system; - prehook = ./prehook.sh; - posthook = ./posthook.sh; + preHook = ./prehook.sh; initialPath = (import ./path.nix) {pkgs = pkgs;}; + + inherit stdenv; + + gcc = (import ../../build-support/gcc-wrapper) { + name = pkgs.gcc.name; + nativeTools = false; + nativeGlibc = true; + inherit (pkgs) gcc binutils; + inherit stdenv; + }; + param1 = pkgs.bash; - param2 = pkgs.gcc; - param3 = pkgs.binutils; - param4 = ""; - param5 = ""; - noSysDirs = false; } diff --git a/pkgs/stdenv/nix/prehook.sh b/pkgs/stdenv/nix/prehook.sh index e6052113f168..af5121f49c38 100644 --- a/pkgs/stdenv/nix/prehook.sh +++ b/pkgs/stdenv/nix/prehook.sh @@ -1,7 +1 @@ export SHELL=$param1 - -echo "SHELL = $SHELL" - -export NIX_CC=$param2/bin/gcc -export NIX_CXX=$param2/bin/g++ -export NIX_LD=$param3/bin/ld |