From 12939e2ac3b588ddd150c257189b5b61d7e07b97 Mon Sep 17 00:00:00 2001 From: justinlime Date: Sun, 21 Jan 2024 16:38:22 -0600 Subject: [PATCH 1/3] lsix: switch to finalAttrs pattern --- pkgs/tools/graphics/lsix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/tools/graphics/lsix/default.nix index 7cbe2ee8626c..8fc659330f6e 100644 --- a/pkgs/tools/graphics/lsix/default.nix +++ b/pkgs/tools/graphics/lsix/default.nix @@ -1,13 +1,13 @@ { lib, stdenvNoCC, fetchFromGitHub, makeWrapper, imagemagick }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "lsix"; version = "1.8.2"; src = fetchFromGitHub { owner = "hackerb9"; - repo = pname; - rev = version; + repo = "lsix"; + rev = finalAttrs.version; sha256 = "sha256-xlOlAfZonSo/RERt5WxPqMvppVrY5/Yhh7SgCCsYDQE="; }; @@ -34,4 +34,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ kidonng ]; mainProgram = "lsix"; }; -} +}) From b28c2837d12d961af42e930725f7d1b36c64ef87 Mon Sep 17 00:00:00 2001 From: justinlime Date: Sun, 21 Jan 2024 16:40:28 -0600 Subject: [PATCH 2/3] lsix: Fix Font Issues --- pkgs/tools/graphics/lsix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/tools/graphics/lsix/default.nix index 8fc659330f6e..b3aa5f253015 100644 --- a/pkgs/tools/graphics/lsix/default.nix +++ b/pkgs/tools/graphics/lsix/default.nix @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { postFixup = '' wrapProgram $out/bin/lsix \ - --prefix PATH : ${lib.makeBinPath [ imagemagick ]} + --prefix PATH : ${lib.makeBinPath [ (imagemagick.override { ghostscriptSupport = true;}) ]} ''; meta = with lib; { From 7de26cd22225fc9760d1b2a34f730bb6cc9e233e Mon Sep 17 00:00:00 2001 From: justinlime Date: Sun, 21 Jan 2024 16:40:44 -0600 Subject: [PATCH 3/3] lsix: add maintainer justinlime --- pkgs/tools/graphics/lsix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/tools/graphics/lsix/default.nix index b3aa5f253015..b054351bf9ab 100644 --- a/pkgs/tools/graphics/lsix/default.nix +++ b/pkgs/tools/graphics/lsix/default.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/hackerb9/lsix"; license = licenses.gpl3Only; platforms = platforms.all; - maintainers = with maintainers; [ kidonng ]; + maintainers = with maintainers; [ justinlime kidonng ]; mainProgram = "lsix"; }; })