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

gnome3.mutter: hardcode path to zenity

Browse Source
This commit is contained in:
worldofpeace 2019-03-31 19:31:17 -04:00 committed by Jan Tojnar
parent 3388f833d7
commit b8e655ad6e
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/desktops/gnome-3/core/mutter/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo { fetchurl, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo
, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 , pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
, ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput , ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
, gsettings-desktop-schemas, glib, gtk3, gnome-desktop , gsettings-desktop-schemas, glib, gtk3, gnome-desktop
@ -47,6 +47,13 @@ stdenv.mkDerivation rec {
gnome-settings-daemon gnome-settings-daemon
]; ];
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit zenity;
})
];
postPatch = '' postPatch = ''
patchShebangs src/backends/native/gen-default-modes.py patchShebangs src/backends/native/gen-default-modes.py
''; '';

13
pkgs/desktops/gnome-3/core/mutter/fix-paths.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/core/util.c b/src/core/util.c
index 57b73747d..f424cc81c 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -636,7 +636,7 @@ meta_show_dialog (const char *type,
args = g_ptr_array_new ();
- append_argument (args, "zenity");
+ append_argument (args, "@zenity@/bin/zenity");
append_argument (args, type);
if (display)