diff options
| author | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-01 22:36:50 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@users.noreply.github.com> | 2016-05-01 22:36:50 +0200 |
| commit | 0ad1c9788ad2c9322a619882a3226a35d3e42c4e (patch) | |
| tree | f2331ef9cf459aa5187376c436c5c998d41f4eeb | |
| parent | d9ad7d529d43c6b6c9f45e913b0408e992d7dfa3 (diff) | |
| parent | 3ba689ee2ea33afe71f0cd78070b3da506e5d50f (diff) | |
| download | nixlib-0ad1c9788ad2c9322a619882a3226a35d3e42c4e.tar nixlib-0ad1c9788ad2c9322a619882a3226a35d3e42c4e.tar.gz nixlib-0ad1c9788ad2c9322a619882a3226a35d3e42c4e.tar.bz2 nixlib-0ad1c9788ad2c9322a619882a3226a35d3e42c4e.tar.lz nixlib-0ad1c9788ad2c9322a619882a3226a35d3e42c4e.tar.xz nixlib-0ad1c9788ad2c9322a619882a3226a35d3e42c4e.tar.zst nixlib-0ad1c9788ad2c9322a619882a3226a35d3e42c4e.zip | |
Merge pull request #15133 from bobvanderlinden/fix-nwjs-popcorntime
nwjs: use correct nwEnv and rpath
| -rw-r--r-- | pkgs/development/tools/node-webkit/nw12.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 4cacc75d7776..f0ede1e52378 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -11,10 +11,12 @@ let paths = [ xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage - xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc + xorg.libXext xorg.libXfixes nss nspr gconf expat dbus xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap libnotify ]; + + extraOutputsToInstall = [ "lib" "out" ]; }; in stdenv.mkDerivation rec { @@ -39,7 +41,7 @@ in stdenv.mkDerivation rec { ln -s ${libudev.out}/lib/libudev.so $out/share/nwjs/libudev.so.0 - patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nw + patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc mkdir -p $out/bin |