From 149ba785e073379398e09ca4be26a2f48ec52444 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 22 Dec 2025 23:18:04 +0800 Subject: [PATCH] xfce.xfdesktop: Move away from mkXfceDerivation To reduce the diff when build system change comes. mkXfceDerivation is generally pointless with meson. --- pkgs/desktops/xfce/core/xfdesktop/default.nix | 40 ++++++++++++++++--- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index 9f358cc889e9..5e669868a5a8 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -1,6 +1,11 @@ { + stdenv, lib, - mkXfceDerivation, + fetchFromGitLab, + gettext, + pkg-config, + xfce4-dev-tools, + wrapGAppsHook3, exo, gtk3, libxfce4ui, @@ -12,14 +17,27 @@ garcon, gtk-layer-shell, thunar, + gitUpdater, }: -mkXfceDerivation { - category = "xfce"; +stdenv.mkDerivation (finalAttrs: { pname = "xfdesktop"; version = "4.20.1"; - sha256 = "sha256-QBzsHXEdTGj8PlgB+L/TJjxAVksKqf+9KrRN3YaBf44="; + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "xfce"; + repo = "xfdesktop"; + tag = "xfdesktop-${finalAttrs.version}"; + hash = "sha256-QBzsHXEdTGj8PlgB+L/TJjxAVksKqf+9KrRN3YaBf44="; + }; + + nativeBuildInputs = [ + gettext + pkg-config + xfce4-dev-tools + wrapGAppsHook3 + ]; buildInputs = [ exo @@ -35,8 +53,20 @@ mkXfceDerivation { thunar ]; + configureFlags = [ "--enable-maintainer-mode" ]; + enableParallelBuilding = true; + + passthru.updateScript = gitUpdater { + rev-prefix = "xfdesktop-"; + odd-unstable = true; + }; + meta = { description = "Xfce's desktop manager"; + homepage = "https://gitlab.xfce.org/xfce/xfdesktop"; + mainProgram = "xfdesktop"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; teams = [ lib.teams.xfce ]; }; -} +})