From a739f1a334459aed236c0ee45233b46e8570bc56 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 21 Dec 2025 22:35:02 +0800 Subject: [PATCH] xfce.xfce4-appfinder: Move away from mkXfceDerivation To reduce the diff when build system change comes. mkXfceDerivation is generally pointless with meson. --- .../xfce/core/xfce4-appfinder/default.nix | 42 +++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix index 2ebe6fea6c8a..77563a44a736 100644 --- a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix @@ -1,22 +1,38 @@ { + stdenv, lib, - mkXfceDerivation, - exo, + fetchFromGitLab, + gettext, + pkg-config, + xfce4-dev-tools, + wrapGAppsHook3, garcon, gtk3, libxfce4util, libxfce4ui, xfconf, + gitUpdater, }: -mkXfceDerivation { - category = "xfce"; +stdenv.mkDerivation (finalAttrs: { pname = "xfce4-appfinder"; version = "4.20.0"; - sha256 = "sha256-HovQnkfv5BOsRPowgMkMEWQmESkivVK0Xb7I15ZaOMc="; + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "xfce"; + repo = "xfce4-appfinder"; + tag = "xfce4-appfinder-${finalAttrs.version}"; + hash = "sha256-HovQnkfv5BOsRPowgMkMEWQmESkivVK0Xb7I15ZaOMc="; + }; + + nativeBuildInputs = [ + gettext + pkg-config + xfce4-dev-tools + wrapGAppsHook3 + ]; - nativeBuildInputs = [ exo ]; buildInputs = [ garcon gtk3 @@ -25,8 +41,20 @@ mkXfceDerivation { xfconf ]; + configureFlags = [ "--enable-maintainer-mode" ]; + enableParallelBuilding = true; + + passthru.updateScript = gitUpdater { + rev-prefix = "xfce4-appfinder-"; + odd-unstable = true; + }; + meta = { description = "Appfinder for the Xfce4 Desktop Environment"; + homepage = "https://gitlab.xfce.org/xfce/xfce4-appfinder"; + license = lib.licenses.gpl2Plus; + mainProgram = "xfce4-appfinder"; + platforms = lib.platforms.linux; teams = [ lib.teams.xfce ]; }; -} +})