From d78c7243b329d9fb74d8687e4c23c1150a094fca Mon Sep 17 00:00:00 2001 From: justinlime Date: Mon, 31 Jul 2023 17:01:50 -0500 Subject: [PATCH] farge: fix dependencies & font issue --- pkgs/tools/misc/farge/default.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/farge/default.nix b/pkgs/tools/misc/farge/default.nix index 6b4dcb64efc..1abffc64e02 100644 --- a/pkgs/tools/misc/farge/default.nix +++ b/pkgs/tools/misc/farge/default.nix @@ -1,8 +1,9 @@ { lib , stdenv , fetchFromGitHub -, bash +, makeBinaryWrapper , bc +, libnotify , feh , grim , imagemagick @@ -24,14 +25,24 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-vCMuFMGcI4D4EzbSsXeNGKNS6nBFkfTcAmSzb9UMArc="; }; - buildInputs = [ bash bc feh imagemagick ] - ++ lib.optionals waylandSupport [ grim slurp wl-clipboard ] - ++ lib.optionals x11Support [ xcolor ]; + nativeBuildInputs = [ makeBinaryWrapper ]; + + # Ensure the following programs are found within $PATH + wrapperPath = lib.makeBinPath ([ + bc + feh + #Needed to fix convert: unable to read font `(null)' @ error/annotate.c/RenderFreetype issue + (imagemagick.override { ghostscriptSupport = true;}) + libnotify #Needed for the notify-send function call from the script + ] ++ lib.optionals waylandSupport [ grim slurp wl-clipboard ] + ++ lib.optionals x11Support [ xcolor ]); installPhase = '' runHook preInstall mkdir -p $out/bin install -m755 farge $out/bin + wrapProgram $out/bin/farge \ + --prefix PATH : "${finalAttrs.wrapperPath}" runHook postInstall ''; @@ -40,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/sdushantha/farge"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ jtbx ]; + maintainers = with maintainers; [ jtbx justinlime ]; mainProgram = "farge"; }; })