diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-03 19:58:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-03 19:58:12 -0400 |
| commit | d956f2279b8ac02bd9e48cf2a09dcb66383ab6be (patch) | |
| tree | a9734440a44588d3489a7d4b1275735de1f1d507 | |
| parent | b3e8b01bc9debe5b778d58adb5ea781290172acd (diff) | |
| parent | 7fe664cab25d4ea75e79ebc37d633de3b79a1c00 (diff) | |
| download | nixlib-d956f2279b8ac02bd9e48cf2a09dcb66383ab6be.tar nixlib-d956f2279b8ac02bd9e48cf2a09dcb66383ab6be.tar.gz nixlib-d956f2279b8ac02bd9e48cf2a09dcb66383ab6be.tar.bz2 nixlib-d956f2279b8ac02bd9e48cf2a09dcb66383ab6be.tar.lz nixlib-d956f2279b8ac02bd9e48cf2a09dcb66383ab6be.tar.xz nixlib-d956f2279b8ac02bd9e48cf2a09dcb66383ab6be.tar.zst nixlib-d956f2279b8ac02bd9e48cf2a09dcb66383ab6be.zip | |
Merge pull request #58641 from worldofpeace/mutter328/use-gnome-3-28-branch
gnome3.mutter328: use gnome-3-28 branch
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/3.28.nix | 33 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch | 13 |
2 files changed, 32 insertions, 14 deletions
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index 2988dd1b47e2..30d082e07e29 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -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; { 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 000000000000..6c40624a55da --- /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) |