Commit 8c5884ef authored by Jan Tojnar's avatar Jan Tojnar
Browse files

gnome.mutter: 42.4 → 43.alpha 

https://gitlab.gnome.org/GNOME/mutter/-/compare/42.4...43.alpha



Co-Authored-By: default avatarBobby Rong <rjl931189261@126.com>

Changelog-Reviewed-By: default avatarJan Tojnar <jtojnar@gmail.com>
parent 9da19b71

pkgs/desktops/gnome/core/mutter/default.nix

+3 −16
Original line number Diff line number Diff line 
{ fetchurl

, substituteAll

, runCommand

, lib

, stdenv
@@ -11,7 +10,6 @@ 
, pango

, json-glib

, libstartup_notification

, zenity

, libcanberra

, ninja

, xvfb-run
@@ -46,26 +44,15 @@ 


let self = stdenv.mkDerivation rec {

  pname = "mutter";

  version = "42.4";

  version = "43.alpha";



  outputs = [ "out" "dev" "man" ];



  src = fetchurl {

    url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";

    sha256 = "wix/o9GHBh2/KAw4UOEYt7UAkGXQHeMWFqzVAMSYKkA=";

    sha256 = "IM4d5uTepo8AEFFihn6s6nJ26WdeconFgXIu/Pou7IA=";

  };



  patches = [

    # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking

    # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381

    # ./drop-inheritable.patch



    (substituteAll {

      src = ./fix-paths.patch;

      inherit zenity;

    })

  ];



  mesonFlags = [

    "-Degl_device=true"

    "-Dinstalled_tests=false" # TODO: enable these
@@ -136,7 +123,7 @@ let self = stdenv.mkDerivation rec { 
  PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";



  passthru = {

    libdir = "${self}/lib/mutter-10";

    libdir = "${self}/lib/mutter-11";



    tests = {

      libdirExists = runCommand "mutter-libdir-exists" {} ''

pkgs/desktops/gnome/core/mutter/fix-paths.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
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)