From 96ba0a0702664794b6ee205310ff31012fc9da11 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Thu, 7 Nov 2024 10:25:15 +0800 Subject: [PATCH] docs/hugo-build-module: update package list --- docs/default.nix | 10 ++-------- docs/hugo-build-module.nix | 6 +++++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/docs/default.nix b/docs/default.nix index e7ad474..bd79e8d 100644 --- a/docs/default.nix +++ b/docs/default.nix @@ -92,12 +92,7 @@ in inherit pkgs; modules = [ ( - { - config, - lib, - pkgs, - ... - }: + { lib, ... }: { wrappers.asciidoctor = { arg0 = lib.getExe' gems "asciidoctor"; @@ -129,9 +124,8 @@ in vendorHash = "sha256-qsmXolxEcYjY2jwIlPRqir5gE8TeVknPGIGF4g89x54="; - buildInputs = with pkgs; [ + nativeBuildInputs = [ asciidoctorWrapped - git gems gems.wrappedRuby ]; diff --git a/docs/hugo-build-module.nix b/docs/hugo-build-module.nix index 7332eb9..9d1e5ba 100644 --- a/docs/hugo-build-module.nix +++ b/docs/hugo-build-module.nix @@ -29,6 +29,7 @@ { name ? "${args'.pname}-${args'.version}", + buildInputs ? [ ], nativeBuildInputs ? [ ], passthru ? { }, @@ -210,10 +211,13 @@ let // { nativeBuildInputs = [ hugo - git go ] ++ nativeBuildInputs; + buildInputs = [ + git + ] ++ buildInputs; + inherit (go) GOOS GOARCH; GOFLAGS =