Merge pull request #23969 from jlesquembre/hyper_1.3.1

hyper: 0.8.3 -> 1.3.1
This commit is contained in:
Michael Raskin 2017-03-18 20:03:59 +01:00 committed by GitHub
commit 242abd815c

View file

@ -11,11 +11,11 @@ let
];
in
stdenv.mkDerivation rec {
version = "0.8.3";
version = "1.3.1";
name = "hyper-${version}";
src = fetchurl {
url = "https://github.com/zeit/hyper/releases/download/${version}/hyper-${version}-amd64.deb";
sha256 = "1683gc0fhifn89l9h67yz02pk1xz7p5l3qpiyddr9w21qr9h3lhq";
url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}.deb";
sha256 = "1i1rnq10a9kid8lggrd1gp9g08v98la8idnyk4kx4vn0svqy7nvl";
};
buildInputs = [ dpkg ];
unpackPhase = ''
@ -26,9 +26,8 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p "$out/bin"
mv opt "$out/"
ln -s "$out/opt/Hyper/Hyper" "$out/bin/Hyper"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/Hyper"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" "$out/opt/Hyper/resources/app/node_modules/child_pty/build/Release/exechelper"
ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/hyper"
mv usr/* "$out/"
'';
dontPatchELF = true;