commit d956f2279b8ac02bd9e48cf2a09dcb66383ab6be · pyrox.dev/nixpkgs

+19 -14

pkgs/desktops/gnome-3/core/mutter/3.28.nix

···

       1
       1
       -
       { fetchurl, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo

     

       1
       1
       +
       { fetchFromGitLab, stdenv, substituteAll, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo

     

       2
       2
        
       , glib, gtk3, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3

     

       3
       3
       -
       , gsettings-desktop-schemas, gnome-desktop

     

       3
       3
       +
       , gsettings-desktop-schemas, gnome-desktop, wrapGAppsHook

     

       4
       4
        
       , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput

     

       5
       5
       -
       , geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }:

     

       5
       5
       +
       , geocode-glib, libgudev, libwacom, xwayland, autoreconfHook }:

     

       6
       6
        
       

     

       7
       7
        
       stdenv.mkDerivation rec {

     

       8
       8
       -
         name = "mutter-${version}";

     

       8
       8
       +
         pname = "mutter";

     

       9
       9
        
         version = "3.28.3";

     

       10
       10
        
       

     

       11
       11
       -
         src = fetchurl {

     

       12
       12
       -
           url = "mirror://gnome/sources/mutter/3.28/${name}.tar.xz";

     

       13
       13
       -
           sha256 = "0vq3rmq20d6b1mi6sf67wkzqys6hw5j7n7fd4hndcp19d5i26149";

     

       11
       11
       +
         src = fetchFromGitLab {

     

       12
       12
       +
           domain = "gitlab.gnome.org";

     

       13
       13
       +
           owner = "GNOME";

     

       14
       14
       +
           repo = pname;

     

       15
       15
       +
           rev = "4af8d9d4752a94612a98d619e65828f0070a7b0e"; # HEAD of https://gitlab.gnome.org/GNOME/mutter/tree/gnome-3-28

     

       16
       16
       +
           sha256 = "1rmc1bf80yq776xhygi1jzgia1y44j2mr2n94vlxgzqc0whamx2v";

     

       14
       17
        
         };

     

       15
       18
        
       

     

       19
       19
       +
         patches = [

     

       20
       20
       +
           (substituteAll {

     

       21
       21
       +
             src = ./fix-paths-328.patch;

     

       22
       22
       +
             inherit zenity;

     

       23
       23
       +
           })

     

       24
       24
       +
         ];

     

       25
       25
       +
       

     

       16
       26
        
         configureFlags = [

     

       17
       27
        
           "--with-x"

     

       18
       28
        
           "--disable-static"

     
···

       31
       41
        
           libXtst

     

       32
       42
        
         ];

     

       33
       43
        
       

     

       34
       34
       -
         nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ];

     

       44
       44
       +
         nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool wrapGAppsHook ];

     

       35
       45
        
       

     

       36
       46
        
         buildInputs = [

     

       37
       47
        
           glib gobject-introspection gtk3 gsettings-desktop-schemas upower

     

       38
       48
        
           gnome-desktop cairo pango cogl clutter zenity libstartup_notification

     

       39
       49
        
           geocode-glib libinput libgudev libwacom

     

       40
       50
        
           libcanberra-gtk3 zenity xkeyboard_config libxkbfile

     

       41
       41
       -
           libxkbcommon pipewire

     

       51
       51
       +
           libxkbcommon

     

       42
       52
        
         ];

     

       43
       43
       -
       

     

       44
       44
       -
         preFixup = ''

     

       45
       45
       -
           wrapProgram "$out/bin/mutter" \

     

       46
       46
       -
             --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

     

       47
       47
       -
         '';

     

       48
       53
        
       

     

       49
       54
        
         enableParallelBuilding = true;

     

       50
       55

+13

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

···

       1
       1
       +
       diff --git a/src/core/util.c b/src/core/util.c

     

       2
       2
       +
       index 5b8de18c7..546352a95 100644

     

       3
       3
       +
       --- a/src/core/util.c

     

       4
       4
       +
       +++ b/src/core/util.c

     

       5
       5
       +
       @@ -635,7 +635,7 @@ meta_show_dialog (const char *type,

     

       6
       6
       +
       

     

       7
       7
       +
          args = g_ptr_array_new ();

     

       8
       8
       +
       

     

       9
       9
       +
       -  append_argument (args, "zenity");

     

       10
       10
       +
       +  append_argument (args, "@zenity@/bin/zenity");

     

       11
       11
       +
          append_argument (args, type);

     

       12
       12
       +
       

     

       13
       13
       +
          if (display)