From bc6fa914b30031efb695cc9c245a49b079486302 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 19 Apr 2025 08:32:52 +0800 Subject: [PATCH] clapgrep: 1.3.1 -> 25.04 Diff: https://github.com/luleyleo/clapgrep/compare/refs/tags/v1.3.1...refs/tags/v25.04 --- pkgs/by-name/cl/clapgrep/package.nix | 65 +++++++++++++++++----------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/cl/clapgrep/package.nix b/pkgs/by-name/cl/clapgrep/package.nix index 71fbae07627d..18890ee4410f 100644 --- a/pkgs/by-name/cl/clapgrep/package.nix +++ b/pkgs/by-name/cl/clapgrep/package.nix @@ -1,65 +1,78 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, wrapGAppsHook4, pkg-config, blueprint-compiler, + meson, + ninja, + rustc, + fetchurl, + cargo, + desktop-file-utils, gtk4, libadwaita, glib, + poppler, + gtksourceview5, nix-update-script, }: + let - version = "1.3.1"; - appid = "de.leopoldluley.Clapgrep"; + poppler' = poppler.overrideAttrs (oldAttrs: rec { + version = "25.01.0"; + + src = fetchurl { + url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; + hash = "sha256-fu/BIiB7u9cqMDxeB0P0lB6K6GHiTc8FAeGM4dFBQRI="; + }; + + patches = [ ]; + + doCheck = false; + }); in -rustPlatform.buildRustPackage { +stdenv.mkDerivation (finalAttrs: { pname = "clapgrep"; - inherit version; + version = "25.04"; src = fetchFromGitHub { owner = "luleyleo"; repo = "clapgrep"; - tag = "v${version}"; - hash = "sha256-MYV8MrCIpa8eqp2iCLTNLZrVQOyGsMEGqlnEF43fyls="; + tag = "v${finalAttrs.version}"; + hash = "sha256-mx52z+YpHdq4zSmH1d3KlNhj3ezpoWMGB0FEr4B20sg="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-tpWv8CznTxoAgOf0mb99peqUTQSfv+16dAmX8n7XVDQ="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src; + hash = "sha256-hTejIaXIAi8opZdE2X3vEi+VYoSti8RNB41ikVOWGPk="; + }; nativeBuildInputs = [ + meson + ninja wrapGAppsHook4 pkg-config blueprint-compiler + rustc + rustPlatform.cargoSetupHook + cargo + desktop-file-utils ]; buildInputs = [ gtk4 libadwaita glib + poppler' + gtksourceview5 ]; - env.APP_ID = appid; - - # see Justfile - postInstall = '' - mv $out/bin/clapgrep-gnome $out/bin/clapgrep - install -D assets/${appid}.desktop -t $out/share/applications - install -D assets/${appid}.metainfo.xml -t $out/share/metainfo - install -D assets/icons/hicolor/scalable/apps/${appid}.svg -t $out/share/icons/hicolor/scalable/apps - - mkdir -p assets/locale - cat po/LINGUAS | while read lang; do - mkdir -p assets/locale/$lang/LC_MESSAGES; - msgfmt -o assets/locale/$lang/LC_MESSAGES/${appid}.mo po/$lang.po; - done - cp -r assets/locale -t $out/share - ''; - passthru.updateScript = nix-update-script { }; meta = { @@ -70,4 +83,4 @@ rustPlatform.buildRustPackage { maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "clapgrep"; }; -} +})