diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2013-06-10 10:04:46 +0400 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2013-06-10 10:04:46 +0400 |
commit | 8271de6727b533e7be47ccfd8fa909b5ddbed856 (patch) | |
tree | 16888b8297d0ba698c675b8f0914c2161f25bdd0 /pkgs/misc/emulators | |
parent | 7db886fdb96067a43d72bca30a2802ceb534fc69 (diff) | |
parent | 604652f1dac1c6756a0e9d048433735eebccdb7e (diff) | |
download | nixlib-8271de6727b533e7be47ccfd8fa909b5ddbed856.tar nixlib-8271de6727b533e7be47ccfd8fa909b5ddbed856.tar.gz nixlib-8271de6727b533e7be47ccfd8fa909b5ddbed856.tar.bz2 nixlib-8271de6727b533e7be47ccfd8fa909b5ddbed856.tar.lz nixlib-8271de6727b533e7be47ccfd8fa909b5ddbed856.tar.xz nixlib-8271de6727b533e7be47ccfd8fa909b5ddbed856.tar.zst nixlib-8271de6727b533e7be47ccfd8fa909b5ddbed856.zip |
Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts: pkgs/misc/emulators/wine/default.nix
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 9ff339136e6d..69bcea87f6a3 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge -, libxml2, libxslt, openssl, gnutls, cups, libdrm +, libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper }: assert stdenv.isLinux; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite alsaLib ncurses libpng libjpeg lcms fontforge - libxml2 libxslt openssl gnutls cups + libxml2 libxslt openssl gnutls cups makeWrapper ]; # Wine locates a lot of libraries dynamically through dlopen(). Add @@ -42,7 +42,10 @@ stdenv.mkDerivation rec { # elements specified above. dontPatchELF = true; - postInstall = "install -D ${gecko} $out/share/wine/gecko/${gecko.name}"; + postInstall = '' + install -D ${gecko} $out/share/wine/gecko/${gecko.name} + wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib + ''; enableParallelBuilding = true; |