From f36c560ebde1c2d2f836f9cac15986df464b7ea6 Mon Sep 17 00:00:00 2001 From: klea Date: Wed, 15 Jul 2026 06:20:37 +0000 Subject: [PATCH] cliphist: Handle contrib files Added substitutions for contrib files, which were previously included without full paths to the store. --- pkgs/by-name/cl/cliphist/package.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/cl/cliphist/package.nix b/pkgs/by-name/cl/cliphist/package.nix index 583912d7d693..2928afb2c258 100644 --- a/pkgs/by-name/cl/cliphist/package.nix +++ b/pkgs/by-name/cl/cliphist/package.nix @@ -4,6 +4,12 @@ buildGoModule, fetchFromGitHub, nix-update-script, + gawk, + wl-clipboard, + fuzzel, + fzf, + chafa, + wofi, }: buildGoModule (finalAttrs: { @@ -19,8 +25,23 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-4XyDLOJHdre/1BpjgFt/W6gOlPOvKztE+MsbwE3JAaQ="; + postPatch = '' + substituteInPlace contrib/cliphist-{fuzzel,rofi,wofi}-img \ + --replace-fail "gawk" "${lib.getExe gawk}" + substituteInPlace contrib/cliphist-{fuzzel-img,fzf,fzf-sixel,rofi,rofi-img,wofi-img} \ + --replace-fail "wl-copy" "${lib.getExe' wl-clipboard "wl-copy"}" + substituteInPlace contrib/cliphist-fuzzel-img \ + --replace-fail "fuzzel " "${lib.getExe fuzzel} " + substituteInPlace contrib/cliphist-fzf{,-sixel} \ + --replace-fail "fzf " "${lib.getExe fzf} " + substituteInPlace contrib/cliphist-fzf-sixel \ + --replace-fail "chafa " "${lib.getExe chafa} " + substituteInPlace contrib/cliphist-wofi-img \ + --replace-fail "| wofi" "| ${lib.getExe wofi}" + ''; + postInstall = '' - cp ${finalAttrs.src}/contrib/* $out/bin/ + cp ./contrib/cliphist-{fuzzel-img,fzf,fzf-sixel,rofi,rofi-img,wofi-img} $out/bin/ ''; passthru = {