git.iko.soy/typeable/nixpkgs
on master help sign in
Fixed fatal error with X11 and libGL while building playonlinux on unstable
commitdc4b9b30ed4c3ee15cfef04fb1316f6f019000ed authormtrsk <marcos.schonfinkel@gmail.com> dateWed 6 Mar 2019, 19:39 (8 years ago) parent171eb30
1 file changed+5−2
pkgs/applications/misc/playonlinux/default.nix+5−2
pkgs/applications/misc/playonlinux/default.nix+5−2
@@ -20,6 +20,8 @@
2020, which
2121, curl
2222, jq
23+, xorg
24+, libGL
2325}:
2426
2527let
@@ -50,7 +52,7 @@ let
5052 else if stdenv.hostPlatform.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
5153 else throw "Unsupported platform for PlayOnLinux: ${stdenv.hostPlatform.system}";
5254 ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
53− libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xorg.libX11 ];
55+ libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 xorg.libX11.dev libGL ];
5456
5557in stdenv.mkDerivation {
5658 name = "playonlinux-${version}";
@@ -66,6 +68,8 @@ in stdenv.mkDerivation {
6668 [ python2Packages.python
6769 python2Packages.wxPython
6870 python2Packages.setuptools
71+ xorg.libX11.dev
72+ libGL
6973 ];
7074
7175 patchPhase = ''
@@ -102,6 +106,5 @@ in stdenv.mkDerivation {
102106 license = licenses.gpl3;
103107 maintainers = [ maintainers.a1russell ];
104108 platforms = [ "x86_64-linux" "i686-linux" ];
105− broken = true;
106109 };
107110}