about summary refs log tree commit diff
path: root/pkgs/misc/emulators
diff options
context:
space:
mode:
authorEvgeny Egorochkin <phreedom@yandex.ru>2013-06-09 05:35:45 +0300
committerEvgeny Egorochkin <phreedom@yandex.ru>2013-06-09 05:37:47 +0300
commit8a7bd8b200061e1f928cd0d674e4ba4612daa864 (patch)
treeb421172b0583b23134e68d4a8bd077160c217850 /pkgs/misc/emulators
parentc96c105c5cc9fcac41c2daa00370e106cfdadc81 (diff)
downloadnixlib-8a7bd8b200061e1f928cd0d674e4ba4612daa864.tar
nixlib-8a7bd8b200061e1f928cd0d674e4ba4612daa864.tar.gz
nixlib-8a7bd8b200061e1f928cd0d674e4ba4612daa864.tar.bz2
nixlib-8a7bd8b200061e1f928cd0d674e4ba4612daa864.tar.lz
nixlib-8a7bd8b200061e1f928cd0d674e4ba4612daa864.tar.xz
nixlib-8a7bd8b200061e1f928cd0d674e4ba4612daa864.tar.zst
nixlib-8a7bd8b200061e1f928cd0d674e4ba4612daa864.zip
Wine: a crude fix to issue #542: "libgcc_s.so.1 must be installed for pthread_cancel to work".
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r--pkgs/misc/emulators/wine/default.nix9
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 31ed420fe563..81aa28cfd626 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
+, libxml2, libxslt, openssl, gnutls, cups, 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;