From 9341dc94dd3364112badb26f8ed2cd099db43c38 Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 7 Nov 2024 15:05:54 -0500 Subject: [PATCH] commit: run meson checks & cleanup - `rec` -> `finalAttrs` - `strictDeps` --- pkgs/by-name/co/commit/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/commit/package.nix b/pkgs/by-name/co/commit/package.nix index dc241c7df00f..7f4992c77a32 100644 --- a/pkgs/by-name/co/commit/package.nix +++ b/pkgs/by-name/co/commit/package.nix @@ -18,14 +18,14 @@ wrapGAppsHook4, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "commit"; version = "4.2"; src = fetchFromGitHub { owner = "sonnyp"; repo = "Commit"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-L8CI8SAGWhhJyTc8aMPV0s+UevEJGE7n1l7fFnTjdPw="; fetchSubmodules = true; }; @@ -46,10 +46,13 @@ stdenv.mkDerivation rec { patchShebangs {,.}* ''; + strictDeps = true; + nativeBuildInputs = [ appstream blueprint-compiler desktop-file-utils # for `desktop-file-validate` & `update-desktop-database` + gjs glib # for `glib-compile-schemas` gtk4 # for `gtk-update-icon-cache` meson @@ -65,6 +68,8 @@ stdenv.mkDerivation rec { libspelling ]; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + passthru = { updateScript = nix-update-script { }; }; @@ -77,4 +82,4 @@ stdenv.mkDerivation rec { mainProgram = "re.sonny.Commit"; platforms = lib.platforms.linux; }; -} +})