From 3ba689ee2ea33afe71f0cd78070b3da506e5d50f Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 1 May 2016 14:43:36 +0200 Subject: [PATCH] nwjs: use correct nwEnv and rpath This is related to changes in fontconfig, pango, dbus and stdc++. --- pkgs/development/tools/node-webkit/nw12.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 4cacc75d777..f0ede1e5237 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