about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2019-04-17 05:37:07 +0200
committerGitHub <noreply@github.com>2019-04-17 05:37:07 +0200
commitd26027792812fbfad4d0f451b5f47fdabf7fdeb9 (patch)
tree90f81cf4f9ea866afaa007ff3afd21e64817e92a
parentd32b5e57609eb6f5214f87d5a95622468289c864 (diff)
parent2f54c28ddf6eb13760ae009ee867d75dedc578ff (diff)
downloadnixlib-d26027792812fbfad4d0f451b5f47fdabf7fdeb9.tar
nixlib-d26027792812fbfad4d0f451b5f47fdabf7fdeb9.tar.gz
nixlib-d26027792812fbfad4d0f451b5f47fdabf7fdeb9.tar.bz2
nixlib-d26027792812fbfad4d0f451b5f47fdabf7fdeb9.tar.lz
nixlib-d26027792812fbfad4d0f451b5f47fdabf7fdeb9.tar.xz
nixlib-d26027792812fbfad4d0f451b5f47fdabf7fdeb9.tar.zst
nixlib-d26027792812fbfad4d0f451b5f47fdabf7fdeb9.zip
Merge pull request #56997 from mtrsk/playonlinux-fix
Fixed fatal error with libX11 and libGL while building playonlinux
-rw-r--r--pkgs/applications/misc/playonlinux/default.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index da029a535a0f..da09c123dcde 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -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;
   };
 }