diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix | 122 |
1 files changed, 82 insertions, 40 deletions
diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix b/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix index d49c1e2f6aa5..c502eefa352e 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/mutter/default.nix @@ -1,5 +1,4 @@ { fetchurl -, substituteAll , runCommand , lib , stdenv @@ -8,79 +7,90 @@ , gettext , gobject-introspection , cairo +, colord +, lcms2 , pango , json-glib , libstartup_notification -, zenity , libcanberra , ninja , xvfb-run -, xkeyboard_config -, libxkbfile +, libxcvt +, libICE +, libX11 +, libXcomposite +, libXcursor , libXdamage -, libxkbcommon +, libXext +, libXfixes +, libXi , libXtst +, libxkbfile +, xkeyboard_config +, libxkbcommon +, libXrender +, libxcb +, libXrandr +, libXinerama +, libXau , libinput , libdrm , gsettings-desktop-schemas , glib -, gtk3 +, atk +, gtk4 +, fribidi +, harfbuzz , gnome-desktop , pipewire , libgudev , libwacom +, libSM , xwayland , mesa , meson , gnome-settings-daemon , xorgserver , python3 -, wrapGAppsHook +, wrapGAppsHook4 +, gi-docgen , sysprof +, libsysprof-capture , desktop-file-utils , libcap_ng , egl-wayland , graphene +, wayland , wayland-protocols }: -let self = stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "42.4"; + version = "44.2"; - outputs = [ "out" "dev" "man" ]; + outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "wix/o9GHBh2/KAw4UOEYt7UAkGXQHeMWFqzVAMSYKkA="; + url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; + sha256 = "N1ZtflXJPciJTpx/I6e6WHmoswuvZVWCIwCdK0Z0AqE="; }; - 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 + "-Dtests=false" "-Dwayland_eglstream=true" "-Dprofiler=true" - "-Dxwayland_path=${xwayland}/bin/Xwayland" + "-Dxwayland_path=${lib.getExe xwayland}" # This should be auto detected, but it looks like it manages a false # positive. "-Dxwayland_initfd=disabled" + "-Ddocs=true" ]; propagatedBuildInputs = [ # required for pkg-config to detect mutter-clutter json-glib - libXtst libcap_ng graphene ]; @@ -88,14 +98,16 @@ let self = stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils gettext + libxcvt mesa # needed for gbm meson ninja xvfb-run pkg-config python3 - wrapGAppsHook - xorgserver # for cvt command + wrapGAppsHook4 + gi-docgen + xorgserver ]; buildInputs = [ @@ -106,22 +118,45 @@ let self = stdenv.mkDerivation rec { gnome-settings-daemon gobject-introspection gsettings-desktop-schemas - gtk3 + atk + fribidi + harfbuzz libcanberra libdrm libgudev libinput libstartup_notification libwacom - libxkbcommon - libxkbfile - libXdamage + libSM + colord + lcms2 pango pipewire - sysprof - xkeyboard_config + sysprof # for D-Bus interfaces + libsysprof-capture xwayland + wayland wayland-protocols + ] ++ [ + # X11 client + gtk4 + libICE + libX11 + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXtst + libxkbfile + xkeyboard_config + libxkbcommon + libXrender + libxcb + libXrandr + libXinerama + libXau ]; postPatch = '' @@ -132,16 +167,24 @@ let self = stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + # TODO: Move this into a directory devhelp can find. + moveToOutput "share/mutter-12/doc" "$devdoc" + ''; + # Install udev files into our own tree. PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + separateDebugInfo = true; + passthru = { - libdir = "${self}/lib/mutter-10"; + libdir = "${finalAttrs.finalPackage}/lib/mutter-12"; tests = { libdirExists = runCommand "mutter-libdir-exists" {} '' - if [[ ! -d ${self.libdir} ]]; then - echo "passthru.libdir should contain a directory, “${self.libdir}” is not one." + if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then + echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one." exit 1 fi touch $out @@ -149,8 +192,8 @@ let self = stdenv.mkDerivation rec { }; updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "mutter"; + attrPath = "gnome.mutter"; }; }; @@ -161,5 +204,4 @@ let self = stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -}; -in self +}) |