Merge pull request #15133 from bobvanderlinden/fix-nwjs-popcorntime

nwjs: use correct nwEnv and rpath
This commit is contained in:
Joachim Fasting 2016-05-01 22:36:50 +02:00
commit 0ad1c9788a

View file

@ -11,10 +11,12 @@ let
paths = [ paths = [
xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf
freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage 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 xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap
libnotify libnotify
]; ];
extraOutputsToInstall = [ "lib" "out" ];
}; };
in stdenv.mkDerivation rec { 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 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 patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc
mkdir -p $out/bin mkdir -p $out/bin