diff options
author | Domen Kožar <domen@dev.si> | 2014-01-06 22:35:39 +0000 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2014-02-20 01:19:15 +0100 |
commit | fae6079a01b604cdaaab2ecb9bf48368be31255e (patch) | |
tree | 3a7050a583b9cad68653f4c4066afbdbae5767f9 /pkgs/tools/X11 | |
parent | 6adfd13dd4b28546e4ea0dfa4e28727b94c891e9 (diff) | |
download | nixlib-fae6079a01b604cdaaab2ecb9bf48368be31255e.tar nixlib-fae6079a01b604cdaaab2ecb9bf48368be31255e.tar.gz nixlib-fae6079a01b604cdaaab2ecb9bf48368be31255e.tar.bz2 nixlib-fae6079a01b604cdaaab2ecb9bf48368be31255e.tar.lz nixlib-fae6079a01b604cdaaab2ecb9bf48368be31255e.tar.xz nixlib-fae6079a01b604cdaaab2ecb9bf48368be31255e.tar.zst nixlib-fae6079a01b604cdaaab2ecb9bf48368be31255e.zip |
adopt rest of the packages that were failing with the buildPythonPackage changes
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r-- | pkgs/tools/X11/winswitch/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 14 |
2 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix index bd160940b573..2db0d1721735 100644 --- a/pkgs/tools/X11/winswitch/default.nix +++ b/pkgs/tools/X11/winswitch/default.nix @@ -29,12 +29,10 @@ let }' winswitch/util/distro_packaging_util.py ''; - buildPhase = '' - python setup.py build - ''; - - installCommand = '' - PREFIX="$out" python ./setup.py install --prefix="$out" + preInstall = '' + # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix + python setup.py install_data --install-dir=$out --root=$out + sed -i '/data_files = data_files/d' setup.py ''; doCheck = false; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 35370ae21280..f96fa5773230 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ - python cython pkgconfig + cython pkgconfig xorg.libX11 xorg.renderproto xorg.libXrender xorg.libXi xorg.inputproto xorg.kbproto xorg.randrproto xorg.damageproto xorg.compositeproto xorg.xextproto xorg.recordproto @@ -33,9 +33,15 @@ buildPythonPackage rec { # they don't have automated testing out of the box? http://xpra.org/trac/ticket/177 doCheck = false; - buildPhase = '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" - python ./setup.py build --enable-Xdummy + preBuild = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)" + ''; + setupPyBuildFlags = ["--enable-Xdummy"]; + + preInstall = '' + # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix + ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out + sed -i '/ = data_files/d' setup.py ''; meta = { |