From 874856a2280efef403465c1e180354c0748107d5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 31 Mar 2019 19:23:08 -0400 Subject: [PATCH 1/3] 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 --- pkgs/desktops/gnome-3/core/mutter/3.28.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index 2988dd1b47e..616c901a0aa 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -1,16 +1,19 @@ -{ fetchurl, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo +{ fetchFromGitLab, stdenv, fetchpatch, 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 -, 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"; }; configureFlags = [ @@ -38,7 +41,7 @@ stdenv.mkDerivation rec { gnome-desktop cairo pango cogl clutter zenity libstartup_notification geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile - libxkbcommon pipewire + libxkbcommon ]; preFixup = '' From c4df83279ead0b02206a2f394a66a0ddda07b3c1 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 31 Mar 2019 19:38:51 -0400 Subject: [PATCH 2/3] gnome3.mutter328: hardcode path to zenity --- pkgs/desktops/gnome-3/core/mutter/3.28.nix | 9 ++++++++- .../gnome-3/core/mutter/fix-paths-328.patch | 13 +++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch 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) From 7fe664cab25d4ea75e79ebc37d633de3b79a1c00 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 3 Apr 2019 17:02:38 -0400 Subject: [PATCH 3/3] gnome3.mutter328: use wrapGAppsHook --- pkgs/desktops/gnome-3/core/mutter/3.28.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index 6ce131c3907..30d082e07e2 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -1,6 +1,6 @@ { 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, libgudev, libwacom, xwayland, autoreconfHook }: @@ -41,7 +41,7 @@ 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 @@ -51,11 +51,6 @@ stdenv.mkDerivation rec { libxkbcommon ]; - preFixup = '' - wrapProgram "$out/bin/mutter" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - enableParallelBuilding = true; meta = with stdenv.lib; {