diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-02 15:36:14 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-02 15:36:14 +0000 |
commit | 8776ba127c0b63cba6a5b8015154909e5aa3167d (patch) | |
tree | d3ef86b7c17cec48e924a7f0d5d2735822168e3b /pkgs/development/python-modules/wxPython | |
parent | de759967c88370fcd8e7f12832a63bd2ee7b8f9e (diff) | |
download | nixlib-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar nixlib-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.gz nixlib-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.bz2 nixlib-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.lz nixlib-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.xz nixlib-8776ba127c0b63cba6a5b8015154909e5aa3167d.tar.zst nixlib-8776ba127c0b63cba6a5b8015154909e5aa3167d.zip |
* Updated some more packages. However, bittorrent and vlc don't work
right now because wxGTK is broken (it depends on internal symbols in GTK which where made private in GTK 2.4). svn path=/nixpkgs/trunk/; revision=907
Diffstat (limited to 'pkgs/development/python-modules/wxPython')
-rw-r--r-- | pkgs/development/python-modules/wxPython/builder.sh | 22 | ||||
-rw-r--r-- | pkgs/development/python-modules/wxPython/default.nix | 9 |
2 files changed, 22 insertions, 9 deletions
diff --git a/pkgs/development/python-modules/wxPython/builder.sh b/pkgs/development/python-modules/wxPython/builder.sh index 3e36d3f40453..724ddd2e2390 100644 --- a/pkgs/development/python-modules/wxPython/builder.sh +++ b/pkgs/development/python-modules/wxPython/builder.sh @@ -1,6 +1,20 @@ -buildinputs="$wxGTK $python $pkgconfig $gtk" . $stdenv/setup -tar xvfz $src -cd wxPythonSrc-*/wxPython -python setup.py WXPORT=gtk2 BUILD_GLCANVAS=0 BUILD_OGL=0 build install --prefix=$out +flags="WXPORT=gtk2 BUILD_GLCANVAS=0 BUILD_OGL=0" + +configurePhase() { + cd wxPython +} +configurePhase=configurePhase + +buildPhase() { + python setup.py $flags build +} +buildPhase=buildPhase + +installPhase() { + python setup.py $flags install --prefix=$out +} +installPhase=installPhase + +genericBuild \ No newline at end of file diff --git a/pkgs/development/python-modules/wxPython/default.nix b/pkgs/development/python-modules/wxPython/default.nix index 65dda5e5671d..c4844568a3f7 100644 --- a/pkgs/development/python-modules/wxPython/default.nix +++ b/pkgs/development/python-modules/wxPython/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, wxGTK, python}: +{stdenv, fetchurl, pkgconfig, wxGTK, python}: assert wxGTK.compat22; @@ -9,7 +9,6 @@ stdenv.mkDerivation { url = http://heanet.dl.sourceforge.net/sourceforge/wxpython/wxPythonSrc-2.4.2.4.tar.gz; md5 = "ea4eb68e10a0c2a9be643b35dcb78e41"; }; - pkgconfig = wxGTK.pkgconfig; - gtk = wxGTK.gtk; - inherit wxGTK python; -} + buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python]; + inherit wxGTK; # !!! move this down +} // { inherit python; } |