b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixos/manual: Don't depend on non-bin outputs of libxml2 and libxslt

Browse source 
Might fix https://hydra.nixos.org/build/71580290.
This commit is contained in:
Tuomas Tynkkynen 2018-03-21 21:02:15 +02:00
parent 5566bf97e5
commit 3918182cb5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/doc/manual/default.nix
View file

@ -139,7 +139,7 @@ let
manual-combined = runCommand "nixos-manual-combined" manual-combined = runCommand "nixos-manual-combined"
{ inherit sources; { inherit sources;
nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ]; nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
meta.description = "The NixOS manual as plain docbook XML"; meta.description = "The NixOS manual as plain docbook XML";
} }
'' ''
@ -194,7 +194,7 @@ let
olinkDB = runCommand "manual-olinkdb" olinkDB = runCommand "manual-olinkdb"
{ inherit sources; { inherit sources;
nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ]; nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
} }
'' ''
xsltproc \ xsltproc \
@ -244,7 +244,7 @@ in rec {
# Generate the NixOS manual. # Generate the NixOS manual.
manual = runCommand "nixos-manual" manual = runCommand "nixos-manual"
{ inherit sources; { inherit sources;
nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ]; nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
meta.description = "The NixOS manual in HTML format"; meta.description = "The NixOS manual in HTML format";
allowedReferences = ["out"]; allowedReferences = ["out"];
} }
@ -272,7 +272,7 @@ in rec {
manualEpub = runCommand "nixos-manual-epub" manualEpub = runCommand "nixos-manual-epub"
{ inherit sources; { inherit sources;
buildInputs = [ libxml2 libxslt zip ]; buildInputs = [ libxml2.bin libxslt.bin zip ];
} }
'' ''
# Generate the epub manual. # Generate the epub manual.
@ -302,7 +302,7 @@ in rec {
# Generate the NixOS manpages. # Generate the NixOS manpages.
manpages = runCommand "nixos-manpages" manpages = runCommand "nixos-manpages"
{ inherit sources; { inherit sources;
nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ]; nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
allowedReferences = ["out"]; allowedReferences = ["out"];
} }
'' ''