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/python-modules/wxPython | |
| 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/python-modules/wxPython')
| -rw-r--r--[-rwxr-xr-x] | pkgs/development/python-modules/wxPython/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/wxPython/default.nix | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/wxPython/builder.sh b/pkgs/development/python-modules/wxPython/builder.sh index dafbc9038637..3e36d3f40453 100755..100644 --- a/pkgs/development/python-modules/wxPython/builder.sh +++ b/pkgs/development/python-modules/wxPython/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$wxGTK $python $pkgconfig $gtk" . $stdenv/setup diff --git a/pkgs/development/python-modules/wxPython/default.nix b/pkgs/development/python-modules/wxPython/default.nix index 0cd19b9fe034..65dda5e5671d 100644 --- a/pkgs/development/python-modules/wxPython/default.nix +++ b/pkgs/development/python-modules/wxPython/default.nix @@ -2,9 +2,8 @@ assert wxGTK.compat22; -derivation { +stdenv.mkDerivation { name = "wxPython-2.4.2.4"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://heanet.dl.sourceforge.net/sourceforge/wxpython/wxPythonSrc-2.4.2.4.tar.gz; @@ -12,5 +11,5 @@ derivation { }; pkgconfig = wxGTK.pkgconfig; gtk = wxGTK.gtk; - inherit stdenv wxGTK python; + inherit wxGTK python; } |