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/tools/misc/swig | |
| 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/development/tools/misc/swig')
| -rw-r--r--[-rwxr-xr-x] | pkgs/development/tools/misc/swig/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/swig/default.nix | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/tools/misc/swig/builder.sh b/pkgs/development/tools/misc/swig/builder.sh index 25a5040e45d6..10d96cbea53c 100755..100644 --- a/pkgs/development/tools/misc/swig/builder.sh +++ b/pkgs/development/tools/misc/swig/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$perl $python" . $stdenv/setup || exit 1 diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index a84ad4fc1f35..d0dd0a8cd3d7 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -4,9 +4,8 @@ assert perlSupport -> perl != null; assert pythonSupport -> python != null; -derivation { +stdenv.mkDerivation { name = "swig-1.3.19"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { @@ -17,7 +16,6 @@ derivation { perlSupport = perlSupport; pythonSupport = pythonSupport; - stdenv = stdenv; perl = if perlSupport then perl else null; python = if pythonSupport then python else null; } \ No newline at end of file |