diff options
Diffstat (limited to 'pkgs/misc/emulators/wine/default.nix')
-rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 31ed420fe563..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 +, libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper }: assert stdenv.isLinux; @@ -25,14 +25,14 @@ 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 # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.gcc.gcc mesa mesa.libdrm + freetype fontconfig stdenv.gcc.gcc mesa libdrm xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXcursor xlibs.libXcomposite libpng libjpeg openssl gnutls cups @@ -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; |