From 9d3ba92d635aaf728423488205b04f15e8953887 Mon Sep 17 00:00:00 2001 From: pennae Date: Sat, 8 Jan 2022 16:03:23 +0100 Subject: [PATCH] nixos/documentation: fix docs cross build a few things should've used buildPackages/nativeBuildInputs to not not require the host architecture for building docs. tested by building aarch64-linux docs on x86_64-linux, and the result looks good. --- nixos/doc/manual/default.nix | 2 +- nixos/modules/misc/documentation.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 52d500c64d33..e96bc47b4a53 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -214,7 +214,7 @@ in rec { manualEpub = runCommand "nixos-manual-epub" { inherit sources; - buildInputs = [ libxml2.bin libxslt.bin zip ]; + nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin buildPackages.zip ]; } '' # Generate the epub manual. diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 7d8fc08b60e3..b7746ddc2115 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -76,7 +76,7 @@ let } '' export NIX_STORE_DIR=$TMPDIR/store export NIX_STATE_DIR=$TMPDIR/state - ${pkgs.nix}/bin/nix-instantiate \ + ${pkgs.buildPackages.nix}/bin/nix-instantiate \ --show-trace \ --eval --json --strict \ --argstr libPath "$libPath" \