pantheon: Default to mutter 48 (#481657) (48698d12) · Commits · nix / nixpkgs

pkgs/by-name/gn/gnome-settings-daemon46/add-gnome-session-ctl-option.patch→pkgs/by-name/gn/gnome-settings-daemon48/add-gnome-session-ctl-option.patch

+0 −0

File moved.

View file

pkgs/by-name/gn/gnome-settings-daemon46/fix-paths.patch→pkgs/by-name/gn/gnome-settings-daemon48/fix-paths.patch

+0 −0

File moved.

View file

pkgs/by-name/gn/gnome-settings-daemon46/package.nix→pkgs/by-name/gn/gnome-settings-daemon48/package.nix

+21 −4

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		stdenv,
		lib,
		replaceVars,
		buildPackages,
		fetchurl,
		meson,
		ninja,
		@@ -36,15 +37,17 @@
		tzdata,
		gcr_4,
		gnome-session-ctl,
		udevCheckHook,
		withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
		}:

		stdenv.mkDerivation (finalAttrs: {
		pname = "gnome-settings-daemon";
		version = "46.0";
		version = "48.1";

		src = fetchurl {
		url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
		hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c=";
		hash = "sha256-OGCi6iFNy8tmAK56HjNYpTiSFQh7w+SkfO4/h7ruBi4=";
		};

		patches = [
		@@ -56,17 +59,24 @@ stdenv.mkDerivation (finalAttrs: {
		})
		];

		depsBuildBuild = [
		buildPackages.stdenv.cc
		pkg-config
		];

		nativeBuildInputs = [
		meson
		ninja
		pkg-config
		perl
		gettext
		glib
		libxml2
		libxslt
		docbook_xsl
		wrapGAppsHook3
		python3
		udevCheckHook
		];

		buildInputs = [
		@@ -87,14 +97,19 @@ stdenv.mkDerivation (finalAttrs: {
		polkit
		geocode-glib_2
		geoclue2
		systemd
		libgudev
		libwacom
		gcr_4
		]
		++ lib.optionals withSystemd [
		systemd
		];

		mesonFlags = [
		"-Dudev_dir=${placeholder "out"}/lib/udev"
		(lib.mesonBool "systemd" withSystemd)
		]
		++ lib.optionals withSystemd [
		"-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl"
		];

		@@ -103,12 +118,14 @@ stdenv.mkDerivation (finalAttrs: {
		env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS";

		postPatch = ''
		for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do
		for f in plugins/power/gsd-power-constants-update.pl; do
		chmod +x $f
		patchShebangs $f
		done
		'';

		doInstallCheck = true;

		meta = {
		description = "GNOME Settings Daemon";
		homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/";

pkgs/by-name/mu/mutter46/package.nix→pkgs/by-name/mu/mutter48/package.nix

+26 −10

Original line number	Diff line number	Diff line
		@@ -8,13 +8,16 @@
		gobject-introspection,
		cairo,
		colord,
		docutils,
		lcms2,
		pango,
		libstartup_notification,
		libcanberra,
		ninja,
		xvfb-run,
		libadwaita,
		libxcvt,
		libGL,
		libICE,
		libX11,
		libXcomposite,
		@@ -27,7 +30,6 @@
		libxkbfile,
		xkeyboard_config,
		libxkbcommon,
		libXrender,
		libxcb,
		libXrandr,
		libXinerama,
		@@ -69,7 +71,7 @@

		stdenv.mkDerivation (finalAttrs: {
		pname = "mutter";
		version = "46.8";
		version = "48.7";

		outputs = [
		"out"
		@@ -80,13 +82,15 @@ stdenv.mkDerivation (finalAttrs: {

		src = fetchurl {
		url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
		hash = "sha256-+8CDVEr7O4Vn18pobCF/g3sG+UeNbiV0FZ/5ocjhyWI=";
		hash = "sha256-7BAqo8uw45ABIGYnrKMFUxRVX3BgneXmwrfvzR+pDyA=";
		};

		mesonFlags = [
		"-Degl_device=true"
		"-Dinstalled_tests=false" # TODO: enable these
		"-Dtests=false"
		"-Dtests=disabled"
		# For NVIDIA proprietary driver up to 470.
		# https://src.fedoraproject.org/rpms/mutter/pull-request/49
		"-Dwayland_eglstream=true"
		"-Dprofiler=true"
		"-Dxwayland_path=${lib.getExe xwayland}"
		@@ -104,13 +108,16 @@ stdenv.mkDerivation (finalAttrs: {

		nativeBuildInputs = [
		desktop-file-utils
		docutils # for rst2man
		gettext
		glib
		libxcvt
		meson
		ninja
		xvfb-run
		pkg-config
		python3
		python3.pkgs.argcomplete # for register-python-argcomplete
		wayland-scanner
		wrapGAppsHook4
		gi-docgen
		@@ -134,6 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
		libgbm
		libei
		libdisplay-info
		libGL
		libgudev
		libinput
		libstartup_notification
		@@ -162,36 +170,43 @@ stdenv.mkDerivation (finalAttrs: {
		libxkbfile
		xkeyboard_config
		libxkbcommon
		libXrender
		libxcb
		libXrandr
		libXinerama
		libXau

		# for gdctl shebang
		(python3.withPackages (pp: [
		pp.pygobject3
		pp.argcomplete
		]))
		];

		postPatch = ''
		patchShebangs src/backends/native/gen-default-modes.py
		'';

		postInstall = ''
		${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas"
		# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3981
		substituteInPlace src/frames/main.c \
		--replace-fail "libadwaita-1.so.0" "${libadwaita}/lib/libadwaita-1.so.0"
		'';

		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-14/doc" "$devdoc"
		moveToOutput "share/mutter-${finalAttrs.passthru.libmutter_api_version}/doc" "$devdoc"
		'';

		# Install udev files into our own tree.
		env.PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";

		separateDebugInfo = true;
		strictDeps = true;

		doInstallCheck = true;

		passthru = {
		libdir = "${finalAttrs.finalPackage}/lib/mutter-14";
		libmutter_api_version = "16"; # bumped each dev cycle
		libdir = "${finalAttrs.finalPackage}/lib/mutter-${finalAttrs.passthru.libmutter_api_version}";

		tests = {
		libdirExists = runCommand "mutter-libdir-exists" { } ''
		@@ -208,6 +223,7 @@ stdenv.mkDerivation (finalAttrs: {
		description = "Window manager for GNOME";
		mainProgram = "mutter";
		homepage = "https://gitlab.gnome.org/GNOME/mutter";
		changelog = "https://gitlab.gnome.org/GNOME/mutter/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
		license = lib.licenses.gpl2Plus;
		teams = [ lib.teams.pantheon ];
		platforms = lib.platforms.linux;

pkgs/desktops/pantheon/default.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -45,10 +45,10 @@ lib.makeScope pkgs.newScope (

		teams = [ lib.teams.pantheon ];

		mutter = pkgs.mutter46;
		mutter = pkgs.mutter48;

		# Using 43 to match Mutter used in Pantheon
		gnome-settings-daemon = pkgs.gnome-settings-daemon46;
		# Using 48 to match Mutter used in Pantheon
		gnome-settings-daemon = pkgs.gnome-settings-daemon48;

		elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { };