diff options
| author | Bob van der Linden <bobvanderlinden@gmail.com> | 2016-05-01 14:43:36 +0200 |
|---|---|---|
| committer | Bob van der Linden <bobvanderlinden@gmail.com> | 2016-05-01 19:39:56 +0200 |
| commit | 3ba689ee2ea33afe71f0cd78070b3da506e5d50f (patch) | |
| tree | 2d7b839b0a8f98e1982e2ffd209b7c596a4be51e /pkgs/development/tools/node-webkit | |
| parent | 84a2de0511969246e59a5124804650055ff59cf8 (diff) | |
| download | nixlib-3ba689ee2ea33afe71f0cd78070b3da506e5d50f.tar nixlib-3ba689ee2ea33afe71f0cd78070b3da506e5d50f.tar.gz nixlib-3ba689ee2ea33afe71f0cd78070b3da506e5d50f.tar.bz2 nixlib-3ba689ee2ea33afe71f0cd78070b3da506e5d50f.tar.lz nixlib-3ba689ee2ea33afe71f0cd78070b3da506e5d50f.tar.xz nixlib-3ba689ee2ea33afe71f0cd78070b3da506e5d50f.tar.zst nixlib-3ba689ee2ea33afe71f0cd78070b3da506e5d50f.zip | |
nwjs: use correct nwEnv and rpath
This is related to changes in fontconfig, pango, dbus and stdc++.
Diffstat (limited to 'pkgs/development/tools/node-webkit')
| -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 |