Merge #1187 into p/stdenv

Tested building firefox, kdelibs, evince on x86_64-linux.
2014-05-27 16:59:16 +02:00
parent db3b440150 8d54dc6d13
commit 872860e6de
39 changed files with 2138 additions and 45 deletions
--- a/pkgs/misc/emulators/wine/stable.nix
+++ b/pkgs/misc/emulators/wine/stable.nix
@@ -62,6 +62,9 @@ in stdenv.mkDerivation rec {
    install -D ${gecko} $out/share/wine/gecko/${gecko64.name}
  '' + ''
    install -D ${mono} $out/share/wine/mono/${mono.name}
+
+    paxmark psmr $out/bin/wine{,-preloader}
+
    wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib
  '';