Commit 6d8750fa authored by Naoki OKAMURA's avatar Naoki OKAMURA

improved: updated playonlinux package

parent 4c9478ca
......@@ -4,7 +4,7 @@
, cabextract
, gettext
, glxinfo
, gnupg1compat
, gnupg
, icoutils
, imagemagick
, netcat-gnu
......@@ -12,7 +12,6 @@
, python2Packages
, unzip
, wget
, wine
, xdg-user-dirs
, xterm
, pkgs
......@@ -20,6 +19,8 @@
, which
, curl
, jq
, xorg
, libGL
}:
let
......@@ -30,14 +31,13 @@ let
python2Packages.python
gettext
glxinfo
gnupg1compat
gnupg
icoutils
imagemagick
netcat-gnu
p7zip
unzip
wget
wine
xdg-user-dirs
xterm
which
......@@ -50,7 +50,7 @@ let
else if stdenv.hostPlatform.system == "i686-linux" then "${pkgs.gcc}/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 pkgs.libGL ];
libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ];
wine-rt-x86 = pkgs.pkgsi686Linux.buildFHSUserEnv rec {
name = "wine-rt-x86-env";
......@@ -105,7 +105,8 @@ in stdenv.mkDerivation {
[ python2Packages.python
python2Packages.wxPython
python2Packages.setuptools
pkgs.xorg.libX11 pkgs.libGL
xorg.libX11
libGL
];
patchPhase = ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment