playonlinux: fix with new wxPython, fix OpenGL check

This commit is contained in:
Nikolay Amiantov 2015-12-09 23:28:31 +03:00
parent c8eaa71cae
commit a5a481e7ee
2 changed files with 49 additions and 61 deletions

View File

@ -1,8 +1,6 @@
{ stdenv
, makeWrapper
, fetchurl
, wxPython
, libXmu
, cabextract
, gettext
, glxinfo
@ -11,18 +9,46 @@
, imagemagick
, netcat
, p7zip
, python
, python2Packages
, unzip
, wget
, wine
, xdg-user-dirs
, xterm
, pkgs
, pkgsi686Linux
}:
stdenv.mkDerivation rec {
name = "playonlinux-${version}";
let
version = "4.2.9";
binpath = stdenv.lib.makeSearchPath "bin"
[ cabextract
python2Packages.python
gettext
glxinfo
gnupg1compat
icoutils
imagemagick
netcat
p7zip
unzip
wget
wine
xdg-user-dirs
xterm
];
ld32 =
if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
else abort "Unsupported platform for PlayOnLinux";
ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xlibs.libX11 ];
in stdenv.mkDerivation {
name = "playonlinux-${version}";
src = fetchurl {
url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
sha256 = "89bb0fd7cce8cf598ebf38cad716b8587eaca5b916d54386fb24b3ff66b48624";
@ -31,74 +57,34 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs =
[ wxPython
libXmu
cabextract
gettext
glxinfo
gnupg1compat
icoutils
imagemagick
netcat
p7zip
python
unzip
wget
wine
xdg-user-dirs
xterm
[ python2Packages.python
python2Packages.wxPython
python2Packages.setuptools
];
patchPhase = ''
PYFILES="python/*.py python/lib/*.py tests/python/*.py"
sed -i "s/env python[0-9.]*/python/" $PYFILES
patchShebangs python tests/python
sed -i "s/ %F//g" etc/PlayOnLinux.desktop
'';
installPhase = ''
install -d $out/share/playonlinux
install -d $out/bin
cp -r . $out/share/playonlinux/
echo "#!${stdenv.shell}" > $out/bin/playonlinux
echo "$prefix/share/playonlinux/playonlinux \"\$@\"" >> $out/bin/playonlinux
chmod +x $out/bin/playonlinux
install -D -m644 etc/PlayOnLinux.desktop $out/share/applications/playonlinux.desktop
'';
preFixupPhases = [ "preFixupPhase" ];
preFixupPhase = ''
for f in $out/bin/*; do
wrapProgram $f \
makeWrapper $out/share/playonlinux/playonlinux $out/bin/playonlinux \
--prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
--prefix PATH : \
${cabextract}/bin:\
${gettext}/bin:\
${glxinfo}/bin:\
${gnupg1compat}/bin:\
${icoutils}/bin:\
${imagemagick}/bin:\
${netcat}/bin:\
${p7zip}/bin:\
${python}/bin:\
${unzip}/bin:\
${wget}/bin:\
${wine}/bin:\
${xdg-user-dirs}/bin:\
${xterm}/bin
--prefix PATH : ${binpath}
done
for f in $out/share/playonlinux/bin/*; do
bunzip2 $f
done
'';
postFixupPhases = [ "postFixupPhase" ];
postFixupPhase = ''
bunzip2 $out/share/playonlinux/bin/check_dd_x86.bz2
patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${libs pkgsi686Linux} $out/share/playonlinux/bin/check_dd_x86
${if stdenv.system == "x86_64-linux" then ''
bunzip2 $out/share/playonlinux/bin/check_dd_amd64.bz2
patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${libs pkgs} $out/share/playonlinux/bin/check_dd_amd64
'' else ''
rm $out/share/playonlinux/bin/check_dd_amd64.bz2
''}
for f in $out/share/playonlinux/bin/*; do
bzip2 $f
done

View File

@ -12560,7 +12560,9 @@ let
inherit (ocamlPackages) findlib cryptokit yojson;
};
playonlinux = callPackage ../applications/misc/playonlinux { };
playonlinux = callPackage ../applications/misc/playonlinux {
stdenv = stdenv_32bit;
};
shotcut = callPackage ../applications/video/shotcut { mlt = mlt-qt5; };