Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3d54abae4fe4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b7acafb79565
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 31, 2019

  1. gnome3.mutter: hardcode path to zenity

    @worldofpeace
    worldofpeace committed Mar 31, 2019
    Copy the full SHA
    b7acafb View commit details
Showing with 21 additions and 1 deletion.
  1. +8 −1 pkgs/desktops/gnome-3/core/mutter/default.nix
  2. +13 −0 pkgs/desktops/gnome-3/core/mutter/fix-paths.patch
9 changes: 8 additions & 1 deletion pkgs/desktops/gnome-3/core/mutter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
, gsettings-desktop-schemas, glib, gtk3, gnome-desktop
@@ -46,6 +46,13 @@ stdenv.mkDerivation rec {
gnome-settings-daemon
];

patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit zenity;
})
];

postPatch = ''
patchShebangs src/backends/native/gen-default-modes.py
'';
13 changes: 13 additions & 0 deletions pkgs/desktops/gnome-3/core/mutter/fix-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -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)