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

Merge pull request #114820 from bobvanderlinden/pr-hyper-gtk3

Browse Source 
hyper: add required libraries to library path
This commit is contained in:
Sandro
2021-03-03 18:37:11 +01:00
committed by GitHub
parent a2b0ea6865 091bd4d622
commit 6929de24f5
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/terminal-emulators/hyper/default.nix
+5 -4
View File
@@ -1,13 +1,14 @@
{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk2, 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, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }: , libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio, at-spi2-atk }:
let let
libPath = lib.makeLibraryPath [ libPath = lib.makeLibraryPath [
stdenv.cc.cc gtk2 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 alsaLib cups expat udev libpulseaudio libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio
at-spi2-atk
]; ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
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}:\$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/"
''; '';
dontPatchELF = true; dontPatchELF = true;