Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f18b83859e74
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 94e39623a493
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 25, 2020

  1. playonlinux: fix build 

    (cherry picked from commit 93a9ac6)
    @FRidh
    FRidh committed Apr 25, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vszakats Viktor Szakats
    GPG key ID: B5ABD165E2AEF201
    Verified
    Learn about vigilant mode
    Copy the full SHA
    94e3962 View commit details
Showing with 31 additions and 29 deletions.
  1. +31 −29 pkgs/applications/misc/playonlinux/default.nix
60 changes: 31 additions & 29 deletions pkgs/applications/misc/playonlinux/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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