diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-03-31 19:38:51 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-03-31 19:38:51 -0400 |
| commit | c4df83279ead0b02206a2f394a66a0ddda07b3c1 (patch) | |
| tree | d0852059b3ce81d1a5c91855a920f3eb02872bd1 | |
| parent | 874856a2280efef403465c1e180354c0748107d5 (diff) | |
| download | nixpkgs-c4df83279ead0b02206a2f394a66a0ddda07b3c1.tar nixpkgs-c4df83279ead0b02206a2f394a66a0ddda07b3c1.tar.gz nixpkgs-c4df83279ead0b02206a2f394a66a0ddda07b3c1.tar.bz2 nixpkgs-c4df83279ead0b02206a2f394a66a0ddda07b3c1.tar.lz nixpkgs-c4df83279ead0b02206a2f394a66a0ddda07b3c1.tar.xz nixpkgs-c4df83279ead0b02206a2f394a66a0ddda07b3c1.tar.zst nixpkgs-c4df83279ead0b02206a2f394a66a0ddda07b3c1.zip | |
gnome3.mutter328: hardcode path to zenity
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/3.28.nix | 9 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch | 13 |
2 files changed, 21 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index 616c901a0aa..6ce131c3907 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -1,4 +1,4 @@ -{ fetchFromGitLab, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo +{ fetchFromGitLab, stdenv, substituteAll, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo , glib, gtk3, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 , gsettings-desktop-schemas, gnome-desktop , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { sha256 = "1rmc1bf80yq776xhygi1jzgia1y44j2mr2n94vlxgzqc0whamx2v"; }; + patches = [ + (substituteAll { + src = ./fix-paths-328.patch; + inherit zenity; + }) + ]; + configureFlags = [ "--with-x" "--disable-static" diff --git a/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch b/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch new file mode 100644 index 00000000000..6c40624a55d --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/util.c b/src/core/util.c +index 5b8de18c7..546352a95 100644 +--- a/src/core/util.c ++++ b/src/core/util.c +@@ -635,7 +635,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) |