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

Merge pull request #63761 from contrun/patch-1

Browse Source 
franz: use wrapGAppsHook
This commit is contained in:
worldofpeace
2019-07-04 06:20:13 -04:00
committed by GitHub
parent c3441f7498 5fff5efea2
commit 5e30ad610a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/instant-messengers/franz/default.nix
+7 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, autoPatchelfHook, dpkg { stdenv, fetchurl, makeWrapper, wrapGAppsHook, autoPatchelfHook, dpkg
, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk3 , xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk3
, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
# don't remove runtime deps # don't remove runtime deps
dontPatchELF = true; dontPatchELF = true;
nativeBuildInputs = [ autoPatchelfHook makeWrapper dpkg ]; nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapGAppsHook dpkg ];
buildInputs = (with xorg; [ buildInputs = (with xorg; [
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
libXrender libX11 libXtst libXScrnSaver libXrender libX11 libXtst libXScrnSaver
@@ -37,8 +37,12 @@ in stdenv.mkDerivation rec {
--replace Exec=\"/opt/Franz/franz\" Exec=franz --replace Exec=\"/opt/Franz/franz\" Exec=franz
''; '';
dontWrapGApps = true;
postFixup = '' postFixup = ''
wrapProgram $out/opt/Franz/franz --prefix PATH : ${xdg_utils}/bin wrapProgram $out/opt/Franz/franz \
--prefix PATH : ${xdg_utils}/bin \
"''${gappsWrapperArgs[@]}"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {