gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/documentation: fix docs cross build

Browse Source 
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.
This commit is contained in:
pennae
2022-01-08 16:03:23 +01:00
parent 068c0a56c5
commit 9d3ba92d63
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/default.nix
View File

@@ -214,7 +214,7 @@ in rec {
manualEpub = runCommand "nixos-manual-epub" manualEpub = runCommand "nixos-manual-epub"
{ inherit sources; { inherit sources;
buildInputs = [ libxml2.bin libxslt.bin zip ]; nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin buildPackages.zip ];
} }
'' ''
# Generate the epub manual. # Generate the epub manual.

2
nixos/modules/misc/documentation.nix
View File

@@ -76,7 +76,7 @@ let
} '' } ''
export NIX_STORE_DIR=$TMPDIR/store export NIX_STORE_DIR=$TMPDIR/store
export NIX_STATE_DIR=$TMPDIR/state export NIX_STATE_DIR=$TMPDIR/state
${pkgs.nix}/bin/nix-instantiate \ ${pkgs.buildPackages.nix}/bin/nix-instantiate \
--show-trace \ --show-trace \
--eval --json --strict \ --eval --json --strict \
--argstr libPath "$libPath" \ --argstr libPath "$libPath" \