From 7c988f2bbf0cd5d5638dfe79e42684a0899fdb97 Mon Sep 17 00:00:00 2001 From: SnO2WMaN Date: Sun, 21 Aug 2022 08:02:32 +0900 Subject: [PATCH 1/2] add custom satysfi inject --- nix/build-document/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nix/build-document/default.nix b/nix/build-document/default.nix index a919ca7..27880c5 100644 --- a/nix/build-document/default.nix +++ b/nix/build-document/default.nix @@ -8,6 +8,7 @@ in output ? "${removeSuffix ".saty" entrypoint}.pdf", satysfiDist, satysfiLocal ? null, + satysfi ? pkgs.satysfi, }: pkgs.stdenv.mkDerivation { inherit @@ -17,11 +18,9 @@ in satysfiLocal ; - buildInputs = with pkgs; [ - satysfi - jq - moreutils - ]; + buildInputs = + (with pkgs; [jq moreutils]) + ++ [satysfi]; entrypoint = if hasSuffix ".saty" entrypoint From 681823a1b92a5e6d70c959719ca63db91a1495ea Mon Sep 17 00:00:00 2001 From: SnO2WMaN Date: Sun, 21 Aug 2022 08:19:45 +0900 Subject: [PATCH 2/2] rename --- nix/build-document/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nix/build-document/default.nix b/nix/build-document/default.nix index 27880c5..355eb61 100644 --- a/nix/build-document/default.nix +++ b/nix/build-document/default.nix @@ -2,13 +2,13 @@ inherit (pkgs.lib) removeSuffix hasSuffix; in { + package ? pkgs.satysfi, name, src, entrypoint, output ? "${removeSuffix ".saty" entrypoint}.pdf", satysfiDist, satysfiLocal ? null, - satysfi ? pkgs.satysfi, }: pkgs.stdenv.mkDerivation { inherit @@ -18,9 +18,7 @@ in satysfiLocal ; - buildInputs = - (with pkgs; [jq moreutils]) - ++ [satysfi]; + buildInputs = (with pkgs; [jq moreutils]) ++ [package]; entrypoint = if hasSuffix ".saty" entrypoint