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/development/libraries/pcre | |
| 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/development/libraries/pcre')
| -rwxr-xr-x | pkgs/development/libraries/pcre/builder.sh | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/pcre/default.nix | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/development/libraries/pcre/builder.sh b/pkgs/development/libraries/pcre/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/development/libraries/pcre/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 5b98a264e3ca2..9c5e3c67282b9 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,12 +1,9 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "pcre-4.3"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-4.3.tar.bz2; md5 = "7bc7d5b590a41e6f9ede30f272002a02"; }; - inherit stdenv; } |