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/misc/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/misc/nix')
-rw-r--r--[-rwxr-xr-x] | pkgs/misc/nix/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/misc/nix/default.nix | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/misc/nix/builder.sh b/pkgs/misc/nix/builder.sh index 6e868d94bbd8..24de39295273 100755..100644 --- a/pkgs/misc/nix/builder.sh +++ b/pkgs/misc/nix/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$aterm $bdb" . $stdenv/setup diff --git a/pkgs/misc/nix/default.nix b/pkgs/misc/nix/default.nix index ea1ee5267be6..601ab0b6f019 100644 --- a/pkgs/misc/nix/default.nix +++ b/pkgs/misc/nix/default.nix @@ -4,13 +4,12 @@ assert aterm != null && bdb != null; # assert bdb.version >= 4.2 # assert aterm.version >= 2.0 -derivation { +stdenv.mkDerivation { name = "nix-0.5pre807"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.5pre807/nix-0.5pre807.tar.bz2; md5 = "fa64bfc39de3e8903954328e4a90d530"; }; - inherit stdenv aterm bdb; + inherit aterm bdb; } |