JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #56997 from mtrsk/playonlinux-fix

Browse Source 
Fixed fatal error with libX11 and libGL while building playonlinux
This commit is contained in:
Silvan Mosberger 2019-04-17 05:37:07 +02:00 committed by GitHub
commit d260277928
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/misc/playonlinux/default.nix
View File

@ -20,6 +20,8 @@
, which , which
, curl , curl
, jq , jq
, xorg
, libGL
}: }:
let let
@ -50,7 +52,7 @@ let
else if stdenv.hostPlatform.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" else if stdenv.hostPlatform.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
else throw "Unsupported platform for PlayOnLinux: ${stdenv.hostPlatform.system}"; else throw "Unsupported platform for PlayOnLinux: ${stdenv.hostPlatform.system}";
ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xorg.libX11 ]; libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ];
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "playonlinux-${version}"; name = "playonlinux-${version}";
@ -66,6 +68,8 @@ in stdenv.mkDerivation {
[ python2Packages.python [ python2Packages.python
python2Packages.wxPython python2Packages.wxPython
python2Packages.setuptools python2Packages.setuptools
xorg.libX11
libGL
]; ];
patchPhase = '' patchPhase = ''
@ -102,6 +106,5 @@ in stdenv.mkDerivation {
license = licenses.gpl3; license = licenses.gpl3;
maintainers = [ maintainers.a1russell ]; maintainers = [ maintainers.a1russell ];
platforms = [ "x86_64-linux" "i686-linux" ]; platforms = [ "x86_64-linux" "i686-linux" ];
broken = true;
}; };
} }