diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-09-17 10:30:59 +0800 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-11 18:52:28 +0200 |
| commit | 0985312f4faa4e95c669f32d94e47a09c175e80e (patch) | |
| tree | 856978f084f1ba29153f3f90da0ff1b4a6bc8f2a /pkgs/desktops | |
| parent | e6964aea3891ec2828138459cdb182b01fbf3bc3 (diff) | |
| download | nixpkgs-0985312f4faa4e95c669f32d94e47a09c175e80e.tar nixpkgs-0985312f4faa4e95c669f32d94e47a09c175e80e.tar.gz nixpkgs-0985312f4faa4e95c669f32d94e47a09c175e80e.tar.bz2 nixpkgs-0985312f4faa4e95c669f32d94e47a09c175e80e.tar.lz nixpkgs-0985312f4faa4e95c669f32d94e47a09c175e80e.tar.xz nixpkgs-0985312f4faa4e95c669f32d94e47a09c175e80e.tar.zst nixpkgs-0985312f4faa4e95c669f32d94e47a09c175e80e.zip | |
gnome.mutter338: Fix build with separate sysprof
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome/core/mutter/3.38/default.nix | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome/core/mutter/3.38/default.nix b/pkgs/desktops/gnome/core/mutter/3.38/default.nix index 3c2d30b813b..464cd285a78 100644 --- a/pkgs/desktops/gnome/core/mutter/3.38/default.nix +++ b/pkgs/desktops/gnome/core/mutter/3.38/default.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchpatch , substituteAll , runCommand , lib @@ -36,12 +37,12 @@ , python3 , wrapGAppsHook , sysprof +, libsysprof-capture , desktop-file-utils , libcap_ng , egl-wayland , graphene , wayland-protocols -, pantheon }: let self = stdenv.mkDerivation rec { @@ -65,6 +66,20 @@ let self = stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/mutter/issues/536 ./fix-glitches-in-gala.patch + # Stop using source_root()/build_root(). + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1957 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/6288763671692edbc953a2b80225e9a7c7fc87e7.patch"; + sha256 = "immnfZiY+Cgu7xTbo5y8xs0olTa6UGsKgDJ1Xhkhns0="; + }) + + # Fix build with separate sysprof. + # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2572 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch"; + sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU="; + }) + (substituteAll { src = ./fix-paths.patch; inherit zenity; @@ -122,7 +137,8 @@ let self = stdenv.mkDerivation rec { libXdamage pango pipewire - sysprof + sysprof # for D-Bus interfaces + libsysprof-capture xkeyboard_config xwayland wayland-protocols |