diff options
| author | Matej Cotman <cotman.matej@gmail.com> | 2014-09-13 10:01:01 +0200 |
|---|---|---|
| committer | Matej Cotman <cotman.matej@gmail.com> | 2014-09-13 10:04:37 +0200 |
| commit | 77fa9da425c77372805635b5eb6d7de7281fc82e (patch) | |
| tree | 767369872931f6a5279d810d5834fca43089c714 /pkgs/development/tools/node-webkit | |
| parent | e0eb4c5bc5ad3438555a7507bbb0766aa3e08f44 (diff) | |
| download | nixpkgs-77fa9da425c77372805635b5eb6d7de7281fc82e.tar nixpkgs-77fa9da425c77372805635b5eb6d7de7281fc82e.tar.gz nixpkgs-77fa9da425c77372805635b5eb6d7de7281fc82e.tar.bz2 nixpkgs-77fa9da425c77372805635b5eb6d7de7281fc82e.tar.lz nixpkgs-77fa9da425c77372805635b5eb6d7de7281fc82e.tar.xz nixpkgs-77fa9da425c77372805635b5eb6d7de7281fc82e.tar.zst nixpkgs-77fa9da425c77372805635b5eb6d7de7281fc82e.zip | |
properly patch nodewebkit
Diffstat (limited to 'pkgs/development/tools/node-webkit')
| -rw-r--r-- | pkgs/development/tools/node-webkit/default.nix | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/development/tools/node-webkit/default.nix b/pkgs/development/tools/node-webkit/default.nix index 1f101776064..f79a5f562c0 100644 --- a/pkgs/development/tools/node-webkit/default.nix +++ b/pkgs/development/tools/node-webkit/default.nix @@ -9,8 +9,9 @@ let name = "node-webkit-env"; paths = [ xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf - freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage xlibs.libXext - xlibs.libXfixes nss nspr gconf expat dbus udev stdenv.gcc.gcc + freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage + xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.gcc.gcc + xlibs.libXtst xlibs.libXi ]; }; @@ -19,28 +20,27 @@ in stdenv.mkDerivation rec { version = "0.9.2"; src = fetchurl { - url = "https://s3.amazonaws.com/node-webkit/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz"; + url = "http://dl.node-webkit.org/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz"; sha256 = if bits == "x64" then "04b9hgrxxnvrzyc7kmlabvrfbzj9d6lif7z69zgsbn3x25nxxd2n" else "0icwdl564sbx27124js1l4whfld0n6nbysdd522frzk1759dzgri"; }; - patchPhase = '' - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" nw - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" nwsnapshot - ''; - - installPhase = let - LD_LIBRARY_PATH = "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit"; - in '' - mkdir -p $out/bin + installPhase = '' mkdir -p $out/share/node-webkit cp -R * $out/share/node-webkit + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/node-webkit/nw + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot + ln -s ${udev}/lib/libudev.so $out/share/node-webkit/libudev.so.0 - makeWrapper $out/share/node-webkit/nw $out/bin/nw --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}" - makeWrapper $out/share/node-webkit/nwsnapshot $out/bin/nwsnapshot --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}" + patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw + patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot + + mkdir -p $out/bin + ln -s $out/share/node-webkit/nw $out/bin + ln -s $out/share/node-webkit/nwsnapshot $out/bin ''; buildInputs = [ makeWrapper ]; |