public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wine: a crude fix to issue #542: "libgcc_s.so.1 must be installed for pthread_cancel to work".

Browse Source
This commit is contained in:
Evgeny Egorochkin 2013-06-09 05:35:45 +03:00
parent c96c105c5c
commit 8a7bd8b200
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/misc/emulators/wine/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib { stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib
, ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
, libxml2, libxslt, openssl, gnutls, cups , libxml2, libxslt, openssl, gnutls, cups, makeWrapper
}: }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
alsaLib ncurses libpng libjpeg lcms fontforge 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 # Wine locates a lot of libraries dynamically through dlopen(). Add
@ -42,7 +42,10 @@ stdenv.mkDerivation rec {
# elements specified above. # elements specified above.
dontPatchELF = true; 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; enableParallelBuilding = true;