pyrox.dev
Merge pull request #56997 from mtrsk/playonlinux-fix
Fixed fatal error with libX11 and libGL while building playonlinux
authored by Silvan Mosberger and committed by GitHub d2602779 d32b5e57
+5
-2
pkgs/applications/misc/playonlinux/default.nix
+5
-2
pkgs/applications/misc/playonlinux/default.nix
···
20
, which
21
, curl
22
, jq
23
}:
24
25
let
···
50
else if stdenv.hostPlatform.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
51
else throw "Unsupported platform for PlayOnLinux: ${stdenv.hostPlatform.system}";
52
ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
53
-
libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xorg.libX11 ];
54
55
in stdenv.mkDerivation {
56
name = "playonlinux-${version}";
···
66
[ python2Packages.python
67
python2Packages.wxPython
68
python2Packages.setuptools
69
];
70
71
patchPhase = ''
···
102
license = licenses.gpl3;
103
maintainers = [ maintainers.a1russell ];
104
platforms = [ "x86_64-linux" "i686-linux" ];
105
-
broken = true;
106
};
107
}
···
20
, which
21
, curl
22
, jq
23
+
, xorg
24
+
, libGL
25
}:
26
27
let
···
52
else if stdenv.hostPlatform.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
53
else throw "Unsupported platform for PlayOnLinux: ${stdenv.hostPlatform.system}";
54
ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
55
+
libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ];
56
57
in stdenv.mkDerivation {
58
name = "playonlinux-${version}";
···
68
[ python2Packages.python
69
python2Packages.wxPython
70
python2Packages.setuptools
71
+
xorg.libX11
72
+
libGL
73
];
74
75
patchPhase = ''
···
106
license = licenses.gpl3;
107
maintainers = [ maintainers.a1russell ];
108
platforms = [ "x86_64-linux" "i686-linux" ];
109
};
110
}