From 34a118f784b8e408046ff2369aeddfcc083f2b53 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sat, 7 Jun 2025 15:03:42 +0000 Subject: [PATCH] pngpaste: refactor package.nix and hardcode repo. pngpaste: switch to finalAttrs pngpaste: simplify installPhase logic Co-authored-by: Sam W --- pkgs/by-name/pn/pngpaste/package.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/pn/pngpaste/package.nix b/pkgs/by-name/pn/pngpaste/package.nix index eb558b1bb6e8..53ef54ea5099 100644 --- a/pkgs/by-name/pn/pngpaste/package.nix +++ b/pkgs/by-name/pn/pngpaste/package.nix @@ -4,22 +4,21 @@ fetchFromGitHub, }: -let +stdenv.mkDerivation (finalAttrs: { pname = "pngpaste"; version = "0.2.3"; -in -stdenv.mkDerivation { - inherit pname version; + src = fetchFromGitHub { owner = "jcsalterego"; - repo = pname; - rev = version; + repo = "pngpaste"; + tag = finalAttrs.version; sha256 = "uvajxSelk1Wfd5is5kmT2fzDShlufBgC0PDCeabEOSE="; }; installPhase = '' - mkdir -p $out/bin - cp pngpaste $out/bin + runHook preInstall + install -Dm555 pngpaste $out/bin + runHook postInstall ''; meta = { @@ -32,9 +31,9 @@ stdenv.mkDerivation { falling back to PNG. ''; homepage = "https://github.com/jcsalterego/pngpaste"; - changelog = "https://github.com/jcsalterego/pngpaste/raw/${version}/CHANGELOG.md"; + changelog = "https://github.com/jcsalterego/pngpaste/raw/${finalAttrs.version}/CHANGELOG.md"; platforms = lib.platforms.darwin; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ samw ]; }; -} +})