playonlinux: fix build

This commit is contained in:
Frederik Rietdijk 2020-04-21 10:51:15 +02:00 committed by Frederik Rietdijk
parent 6f873e98f4
commit 93a9ac696b

View file

@ -9,7 +9,7 @@
, imagemagick , imagemagick
, netcat-gnu , netcat-gnu
, p7zip , p7zip
, python2Packages , python2
, unzip , unzip
, wget , wget
, wine , wine
@ -27,25 +27,25 @@
let let
version = "4.3.4"; version = "4.3.4";
binpath = stdenv.lib.makeBinPath binpath = stdenv.lib.makeBinPath [
[ cabextract cabextract
python2Packages.python python
gettext gettext
glxinfo glxinfo
gnupg gnupg
icoutils icoutils
imagemagick imagemagick
netcat-gnu netcat-gnu
p7zip p7zip
unzip unzip
wget wget
wine wine
xdg-user-dirs xdg-user-dirs
xterm xterm
which which
curl curl
jq jq
]; ];
ld32 = ld32 =
if stdenv.hostPlatform.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" 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"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ]; libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ];
python = python2.withPackages(ps: with ps; [
wxPython
setuptools
]);
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "playonlinux"; pname = "playonlinux";
inherit version; inherit version;
@ -65,15 +70,13 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = buildInputs = [
[ python2Packages.python xorg.libX11
python2Packages.wxPython libGL
python2Packages.setuptools python
xorg.libX11 ];
libGL
];
patchPhase = '' postPatch = ''
patchShebangs python tests/python patchShebangs python tests/python
sed -i "s/ %F//g" etc/PlayOnLinux.desktop 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 install -D -m644 etc/PlayOnLinux.desktop $out/share/applications/playonlinux.desktop
makeWrapper $out/share/playonlinux/playonlinux $out/bin/playonlinux \ makeWrapper $out/share/playonlinux/playonlinux $out/bin/playonlinux \
--prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
--prefix PATH : ${binpath} --prefix PATH : ${binpath}
bunzip2 $out/share/playonlinux/bin/check_dd_x86.bz2 bunzip2 $out/share/playonlinux/bin/check_dd_x86.bz2