movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #154015 from pennae/fix-docs-cross

Browse source 
nixos/documentation: fix docs cross build
This commit is contained in:
Robert Hensing 2022-01-08 20:44:05 +01:00 • committed by GitHub
commit f80f85f228
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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" \