From dc4b9b30ed4c3ee15cfef04fb1316f6f019000ed Mon Sep 17 00:00:00 2001
From: mtrsk <marcos.schonfinkel@gmail.com>
Date: Wed, 6 Mar 2019 19:39:21 -0300
Subject: [PATCH 1/2] Fixed fatal error with X11 and libGL while building
 playonlinux on unstable

---
 pkgs/applications/misc/playonlinux/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index da029a535a0..7762e05ac43 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 xorg.libX11.dev libGL ];
 
 in stdenv.mkDerivation {
   name = "playonlinux-${version}";
@@ -66,6 +68,8 @@ in stdenv.mkDerivation {
     [ python2Packages.python
       python2Packages.wxPython
       python2Packages.setuptools
+      xorg.libX11.dev
+      libGL
     ];
 
   patchPhase = ''
@@ -102,6 +106,5 @@ in stdenv.mkDerivation {
     license = licenses.gpl3;
     maintainers = [ maintainers.a1russell ];
     platforms = [ "x86_64-linux" "i686-linux" ];
-    broken = true;
   };
 }

From 2f54c28ddf6eb13760ae009ee867d75dedc578ff Mon Sep 17 00:00:00 2001
From: mtrsk <marcos.schonfinkel@gmail.com>
Date: Wed, 6 Mar 2019 19:53:24 -0300
Subject: [PATCH 2/2] No need for xorg.libX11.dev

---
 pkgs/applications/misc/playonlinux/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index 7762e05ac43..da09c123dcd 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -52,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 [ xorg.libX11 xorg.libX11.dev libGL ];
+  libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ];
 
 in stdenv.mkDerivation {
   name = "playonlinux-${version}";
@@ -68,7 +68,7 @@ in stdenv.mkDerivation {
     [ python2Packages.python
       python2Packages.wxPython
       python2Packages.setuptools
-      xorg.libX11.dev
+      xorg.libX11
       libGL
     ];