git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #58641 from worldofpeace/mutter328/use-gnome-3-28-branch

gnome3.mutter328: use gnome-3-28 branch

commitd956f2279b8ac02bd9e48cf2a09dcb66383ab6be authorworldofpeace <worldofpeace@users.noreply.github.com> dateWed 3 Apr 2019, 19:58 (8 years ago) parentb3e8b017fe664c
2 files changed+32−14
pkgs/desktops/gnome-3/core/mutter/3.28.nix+19−14 pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch+13
pkgs/desktops/gnome-3/core/mutter/3.28.nix+19−14
@@ -1,18 +1,28 @@
1−{ fetchurl, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
1+{ fetchFromGitLab, stdenv, substituteAll, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo
22, glib, gtk3, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
3−, gsettings-desktop-schemas, gnome-desktop
3+, gsettings-desktop-schemas, gnome-desktop, wrapGAppsHook
44, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
5−, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:
5+, geocode-glib, libgudev, libwacom, xwayland, autoreconfHook }:
66
77stdenv.mkDerivation rec {
8− name = "mutter-${version}";
8+ pname = "mutter";
99 version = "3.28.3";
1010
11− src = fetchurl {
12− url = "mirror://gnome/sources/mutter/3.28/${name}.tar.xz";
13− sha256 = "0vq3rmq20d6b1mi6sf67wkzqys6hw5j7n7fd4hndcp19d5i26149";
11+ src = fetchFromGitLab {
12+ domain = "gitlab.gnome.org";
13+ owner = "GNOME";
14+ repo = pname;
15+ rev = "4af8d9d4752a94612a98d619e65828f0070a7b0e"; # HEAD of https://gitlab.gnome.org/GNOME/mutter/tree/gnome-3-28
16+ sha256 = "1rmc1bf80yq776xhygi1jzgia1y44j2mr2n94vlxgzqc0whamx2v";
1417 };
1518
19+ patches = [
20+ (substituteAll {
21+ src = ./fix-paths-328.patch;
22+ inherit zenity;
23+ })
24+ ];
25+
1626 configureFlags = [
1727 "--with-x"
1828 "--disable-static"
@@ -31,21 +41,16 @@ stdenv.mkDerivation rec {
3141 libXtst
3242 ];
3343
34− nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];
44+ nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool wrapGAppsHook ];
3545
3646 buildInputs = [
3747 glib gobject-introspection gtk3 gsettings-desktop-schemas upower
3848 gnome-desktop cairo pango cogl clutter zenity libstartup_notification
3949 geocode-glib libinput libgudev libwacom
4050 libcanberra-gtk3 zenity xkeyboard_config libxkbfile
41− libxkbcommon pipewire
51+ libxkbcommon
4252 ];
4353
44− preFixup = ''
45− wrapProgram "$out/bin/mutter" \
46− --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
47− '';
48−
4954 enableParallelBuilding = true;
5055
5156 meta = with stdenv.lib; {
pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/src/core/util.c b/src/core/util.c
2+index 5b8de18c7..546352a95 100644
3+--- a/src/core/util.c
4++++ b/src/core/util.c
5+@@ -635,7 +635,7 @@ meta_show_dialog (const char *type,
6+
7+ args = g_ptr_array_new ();
8+
9+- append_argument (args, "zenity");
10++ append_argument (args, "@zenity@/bin/zenity");
11+ append_argument (args, type);
12+
13+ if (display)