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

hyper: 3.0.2 -> 3.1.2 and fix for desktop files (#132395)

Browse Source 
* (hyper): 3.0.2 -> 3.1.1 and fix for desktop files

* hyper: fix deb hash
Fixes ownload of old cached deb package and addition of "new" dependencies.

* hyper: move desktopItem into mkDerivation

* hyper: Simpler fix for the desktopItem issue
- Subsituting the erronous path for the executable name
- Cleanup of the function args
This commit is contained in:
FGD 2021-08-05 16:26:42 +02:00 committed by GitHub
parent 1248f5ac43
commit 3580b17899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/terminal-emulators/hyper/default.nix
View File

@ -1,36 +1,48 @@
{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk3, cairo { stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk3, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver, libxcb, nss, nspr
, libxcb, nss, nspr, alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk }: , alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk, at-spi2-core, libxshmfence
, libdrm, libxkbcommon, mesa }:
let let
libPath = lib.makeLibraryPath [ libPath = lib.makeLibraryPath [
stdenv.cc.cc gtk3 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus stdenv.cc.cc gtk3 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver nss nspr alsa-lib cups expat udev libpulseaudio libXrender libX11 libXtst libXScrnSaver nss nspr alsa-lib cups expat udev libpulseaudio
at-spi2-atk at-spi2-atk at-spi2-core libxshmfence libdrm libxkbcommon mesa
]; ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.0.2";
pname = "hyper"; pname = "hyper";
version = "3.1.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb"; url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb";
sha256 = "0fv4wv5f8nc739bna83qxmgrvvbyq4w9ch764q2f12wjygrz336p"; sha256 = "1mixy9hlgdbbnwdgidady7q828dkf09lx1pacwxw386jj7kp4y5g";
}; };
buildInputs = [ dpkg ];
nativeBuildInputs = [ dpkg ];
unpackPhase = '' unpackPhase = ''
mkdir pkg mkdir pkg
dpkg-deb -x $src pkg dpkg-deb -x $src pkg
sourceRoot=pkg sourceRoot=pkg
''; '';
installPhase = '' installPhase = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
mv opt "$out/" mv opt "$out/"
ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper" ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Hyper:\$ORIGIN" "$out/opt/Hyper/hyper" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Hyper:\$ORIGIN" "$out/opt/Hyper/hyper"
mv usr/* "$out/" mv usr/* "$out/"
substituteInPlace $out/share/applications/hyper.desktop \
--replace "/opt/Hyper/hyper" "hyper"
''; '';
dontPatchELF = true; dontPatchELF = true;
meta = with lib; { meta = with lib; {
description = "A terminal built on web technologies"; description = "A terminal built on web technologies";