diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-21 10:51:15 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-04-25 08:00:03 +0200 |
| commit | 93a9ac696bad1b3afe072af85ae595686a5b7408 (patch) | |
| tree | 9df2960ebe4fb6010660afe5198ad6f7c4ecc32f /pkgs/applications/misc | |
| parent | 6f873e98f4405b6085f67e2baad67d925cd2a23b (diff) | |
| download | nixlib-93a9ac696bad1b3afe072af85ae595686a5b7408.tar nixlib-93a9ac696bad1b3afe072af85ae595686a5b7408.tar.gz nixlib-93a9ac696bad1b3afe072af85ae595686a5b7408.tar.bz2 nixlib-93a9ac696bad1b3afe072af85ae595686a5b7408.tar.lz nixlib-93a9ac696bad1b3afe072af85ae595686a5b7408.tar.xz nixlib-93a9ac696bad1b3afe072af85ae595686a5b7408.tar.zst nixlib-93a9ac696bad1b3afe072af85ae595686a5b7408.zip | |
playonlinux: fix build
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/playonlinux/default.nix | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index fe9838fe0d97..e3b7c48d2b4b 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -9,7 +9,7 @@ , imagemagick , netcat-gnu , p7zip -, python2Packages +, python2 , unzip , wget , wine @@ -27,25 +27,25 @@ let version = "4.3.4"; - binpath = stdenv.lib.makeBinPath - [ cabextract - python2Packages.python - gettext - glxinfo - gnupg - icoutils - imagemagick - netcat-gnu - p7zip - unzip - wget - wine - xdg-user-dirs - xterm - which - curl - jq - ]; + binpath = stdenv.lib.makeBinPath [ + cabextract + python + gettext + glxinfo + gnupg + icoutils + imagemagick + netcat-gnu + p7zip + unzip + wget + wine + xdg-user-dirs + xterm + which + curl + jq + ]; ld32 = if stdenv.hostPlatform.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" @@ -54,6 +54,11 @@ let ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ]; + python = python2.withPackages(ps: with ps; [ + wxPython + setuptools + ]); + in stdenv.mkDerivation { pname = "playonlinux"; inherit version; @@ -65,15 +70,13 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - buildInputs = - [ python2Packages.python - python2Packages.wxPython - python2Packages.setuptools - xorg.libX11 - libGL - ]; + buildInputs = [ + xorg.libX11 + libGL + python + ]; - patchPhase = '' + postPatch = '' patchShebangs python tests/python sed -i "s/ %F//g" etc/PlayOnLinux.desktop ''; @@ -85,7 +88,6 @@ in stdenv.mkDerivation { install -D -m644 etc/PlayOnLinux.desktop $out/share/applications/playonlinux.desktop makeWrapper $out/share/playonlinux/playonlinux $out/bin/playonlinux \ - --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ --prefix PATH : ${binpath} bunzip2 $out/share/playonlinux/bin/check_dd_x86.bz2 |