Merge pull request #56997 from mtrsk/playonlinux-fix
Fixed fatal error with libX11 and libGL while building playonlinux
This commit is contained in:
commit
d260277928
|
@ -20,6 +20,8 @@
|
|||
, which
|
||||
, curl
|
||||
, jq
|
||||
, xorg
|
||||
, libGL
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -50,7 +52,7 @@ let
|
|||
else if stdenv.hostPlatform.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
|
||||
else throw "Unsupported platform for PlayOnLinux: ${stdenv.hostPlatform.system}";
|
||||
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 {
|
||||
name = "playonlinux-${version}";
|
||||
|
@ -66,6 +68,8 @@ in stdenv.mkDerivation {
|
|||
[ python2Packages.python
|
||||
python2Packages.wxPython
|
||||
python2Packages.setuptools
|
||||
xorg.libX11
|
||||
libGL
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
|
@ -102,6 +106,5 @@ in stdenv.mkDerivation {
|
|||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.a1russell ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue