diff options
| author | Eelco Dolstra | 2004-03-29 17:23:01 +0000 |
|---|---|---|
| committer | Eelco Dolstra | 2004-03-29 17:23:01 +0000 |
| commit | 12ae5363ea658d399bdb008f6ded3cde355f9310 (patch) | |
| tree | e2a2ab3210854bfaad01f955c32b1cda724a8790 /pkgs/tools/system | |
| parent | bc71554fc80a760c3a8e01f9e9e97500aa9ccde1 (diff) | |
* 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/tools/system')
| -rw-r--r--[-rwxr-xr-x] | pkgs/tools/system/which/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/tools/system/which/default.nix | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/tools/system/which/builder.sh b/pkgs/tools/system/which/builder.sh index e6ddd3dfa738..3c09d5ff1374 100755..100644 --- a/pkgs/tools/system/which/builder.sh +++ b/pkgs/tools/system/which/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix index 8d85e4120fc0..0c9f6b6a7764 100644 --- a/pkgs/tools/system/which/default.nix +++ b/pkgs/tools/system/which/default.nix @@ -1,12 +1,10 @@ -{stdenv, fetchurl}: derivation { +{stdenv, fetchurl}: stdenv.mkDerivation { name = "which-2.16"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://ftp.gnu.org/gnu/which/which-2.16.tar.gz; md5 = "830b83af48347a9a3520f561e47cbc9b"; }; - stdenv = stdenv; } |