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: b3e8b01bc9de
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d956f2279b8a
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 31, 2019

  1. gnome3.mutter328: use gnome-3-28 branch 

    Probably should get these patches in while
I'm stuck with this. Alternative would be to
fetch the patches individually.

pipewire was accidentally in buildInputs when it has
been disabled

Changes: https://gitlab.gnome.org/GNOME/mutter/compare/3.28.3...gnome-3-28
    @worldofpeace
    worldofpeace committed Mar 31, 2019
    Copy the full SHA
    874856a View commit details

  2. gnome3.mutter328: hardcode path to zenity

    @worldofpeace
    worldofpeace committed Mar 31, 2019
    Copy the full SHA
    c4df832 View commit details

Commits on Apr 3, 2019

  1. gnome3.mutter328: use wrapGAppsHook

    @worldofpeace
    worldofpeace committed Apr 3, 2019
    Copy the full SHA
    7fe664c View commit details

  2. Merge pull request #58641 from worldofpeace/mutter328/use-gnome-3-28-… 

    …branch

 gnome3.mutter328: use gnome-3-28 branch
    @worldofpeace
    worldofpeace authored Apr 3, 2019
    Copy the full SHA
    d956f22 View commit details
Showing with 32 additions and 14 deletions.
  1. +19 −14 pkgs/desktops/gnome-3/core/mutter/3.28.nix
  2. +13 −0 pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch
33 changes: 19 additions & 14 deletions pkgs/desktops/gnome-3/core/mutter/3.28.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
{ fetchurl, 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
, gsettings-desktop-schemas, gnome-desktop, wrapGAppsHook
, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
, geocode-glib, libgudev, libwacom, xwayland, autoreconfHook }:

stdenv.mkDerivation rec {
name = "mutter-${version}";
pname = "mutter";
version = "3.28.3";

src = fetchurl {
url = "mirror://gnome/sources/mutter/3.28/${name}.tar.xz";
sha256 = "0vq3rmq20d6b1mi6sf67wkzqys6hw5j7n7fd4hndcp19d5i26149";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = "4af8d9d4752a94612a98d619e65828f0070a7b0e"; # HEAD of https://gitlab.gnome.org/GNOME/mutter/tree/gnome-3-28
sha256 = "1rmc1bf80yq776xhygi1jzgia1y44j2mr2n94vlxgzqc0whamx2v";
};

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

configureFlags = [
"--with-x"
"--disable-static"
@@ -31,21 +41,16 @@ stdenv.mkDerivation rec {
libXtst
];

nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool wrapGAppsHook ];

buildInputs = [
glib gobject-introspection gtk3 gsettings-desktop-schemas upower
gnome-desktop cairo pango cogl clutter zenity libstartup_notification
geocode-glib libinput libgudev libwacom
libcanberra-gtk3 zenity xkeyboard_config libxkbfile
libxkbcommon pipewire
libxkbcommon
];

preFixup = ''
wrapProgram "$out/bin/mutter" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';

enableParallelBuilding = true;

meta = with stdenv.lib; {
13 changes: 13 additions & 0 deletions pkgs/desktops/gnome-3/core/mutter/fix-paths-328.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 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)