From b8e655ad6e60178b5b36902040c5b02d2f38b1ad Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 31 Mar 2019 19:31:17 -0400 Subject: [PATCH] gnome3.mutter: hardcode path to zenity --- pkgs/desktops/gnome-3/core/mutter/default.nix | 9 ++++++++- pkgs/desktops/gnome-3/core/mutter/fix-paths.patch | 13 +++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/gnome-3/core/mutter/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 7d8105abbcd..4d3e72e7ff0 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -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 , ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput , gsettings-desktop-schemas, glib, gtk3, gnome-desktop @@ -47,6 +47,13 @@ stdenv.mkDerivation rec { gnome-settings-daemon ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit zenity; + }) + ]; + postPatch = '' patchShebangs src/backends/native/gen-default-modes.py ''; diff --git a/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch b/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch new file mode 100644 index 00000000000..6ac0a431f61 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch @@ -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)