diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-29 17:23:01 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-29 17:23:01 +0000 |
commit | 12ae5363ea658d399bdb008f6ded3cde355f9310 (patch) | |
tree | e2a2ab3210854bfaad01f955c32b1cda724a8790 /pkgs/stdenv/nix/default.nix | |
parent | bc71554fc80a760c3a8e01f9e9e97500aa9ccde1 (diff) | |
download | nixlib-12ae5363ea658d399bdb008f6ded3cde355f9310.tar nixlib-12ae5363ea658d399bdb008f6ded3cde355f9310.tar.gz nixlib-12ae5363ea658d399bdb008f6ded3cde355f9310.tar.bz2 nixlib-12ae5363ea658d399bdb008f6ded3cde355f9310.tar.lz nixlib-12ae5363ea658d399bdb008f6ded3cde355f9310.tar.xz nixlib-12ae5363ea658d399bdb008f6ded3cde355f9310.tar.zst nixlib-12ae5363ea658d399bdb008f6ded3cde355f9310.zip |
* Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and execute permission. * Convert calls to `derivation' to `mkDerivation'. * Remove `system' and `stdenv' attributes from calls to `mkDerivation'. These transformations were all done automatically, so it is quite possible I broke stuff. * Put the `mkDerivation' function in stdenv/generic. svn path=/nixpkgs/trunk/; revision=874
Diffstat (limited to 'pkgs/stdenv/nix/default.nix')
-rw-r--r-- | pkgs/stdenv/nix/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 5d454e26ce78..5634553dd500 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,13 +1,13 @@ -{stdenv, pkgs}: +{stdenv, pkgs, genericStdenv, gccWrapper}: -(import ../generic) { +genericStdenv { name = "stdenv-nix"; preHook = ./prehook.sh; initialPath = (import ./path.nix) {pkgs = pkgs;}; inherit stdenv; - gcc = (import ../../build-support/gcc-wrapper) { + gcc = gccWrapper { name = pkgs.gcc.name; nativeTools = false; nativeGlibc = true; @@ -15,5 +15,7 @@ inherit stdenv; }; + bash = pkgs.bash ~ /bin/sh; + param1 = pkgs.bash; } |