public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nwjs: use correct nwEnv and rpath

Browse Source 
This is related to changes in fontconfig, pango, dbus and stdc++.
This commit is contained in:
Bob van der Linden 2016-05-01 14:43:36 +02:00
parent 84a2de0511
commit 3ba689ee2e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/node-webkit/nw12.nix
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