Merge pull request #19782 from hharnisc/master

Hyperterm: 0.7.6 -> (Hyper) 0.8.3
This commit is contained in:
Tim Steinbach 2016-10-22 19:13:15 -04:00 committed by GitHub
commit 2bc8b12e70
2 changed files with 11 additions and 10 deletions

View file

@ -11,11 +11,11 @@ let
]; ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.7.6"; version = "0.8.3";
name = "hyperterm-${version}"; name = "hyper-${version}";
src = fetchurl { src = fetchurl {
url = https://github.com/zeit/hyperterm/releases/download/v0.7.1/hyperterm-0.7.1.deb; url = "https://github.com/zeit/hyper/releases/download/${version}/hyper-${version}-amd64.deb";
sha256 = "1xdwhmzlkg1ly1xgsbv99xk4x1g1x270vx1b12dvf10ck5x9v63a"; sha256 = "1683gc0fhifn89l9h67yz02pk1xz7p5l3qpiyddr9w21qr9h3lhq";
}; };
buildInputs = [ dpkg ]; buildInputs = [ dpkg ];
unpackPhase = '' unpackPhase = ''
@ -25,16 +25,16 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
ln -s "$out/opt/HyperTerm/HyperTerm" "$out/bin/HyperTerm"
mv opt "$out/" mv opt "$out/"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/HyperTerm/HyperTerm" ln -s "$out/opt/Hyper/Hyper" "$out/bin/Hyper"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" "$out/opt/HyperTerm/resources/app/node_modules/child_pty/build/Release/exechelper" 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"
mv usr/* "$out/" mv usr/* "$out/"
''; '';
dontPatchELF = true; dontPatchELF = true;
meta = with lib; { meta = with lib; {
description = "A terminal built on web technologies"; description = "A terminal built on web technologies";
homepage = https://hyperterm.org/; homepage = https://hyper.is/;
maintainers = with maintainers; [ puffnfresh ]; maintainers = with maintainers; [ puffnfresh ];
license = licenses.mit; license = licenses.mit;
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];

View file

@ -7789,7 +7789,7 @@ in
}; };
libgumbo = callPackage ../development/libraries/libgumbo { }; libgumbo = callPackage ../development/libraries/libgumbo { };
libhangul = callPackage ../development/libraries/libhangul { }; libhangul = callPackage ../development/libraries/libhangul { };
libharu = callPackage ../development/libraries/libharu { }; libharu = callPackage ../development/libraries/libharu { };
@ -13208,7 +13208,8 @@ in
hydrogen = callPackage ../applications/audio/hydrogen { }; hydrogen = callPackage ../applications/audio/hydrogen { };
hyperterm = callPackage ../applications/misc/hyperterm { inherit (gnome2) GConf; }; hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; };
hyperterm = self.hyper;
slack = callPackage ../applications/networking/instant-messengers/slack { }; slack = callPackage ../applications/networking/instant-messengers/slack { };