Merge pull request #4009 from manveru/fix-nixos-doc

fix location of options.xml
This commit is contained in:
Eelco Dolstra 2014-09-09 13:57:57 +02:00
commit dcb36abbf5

View File

@ -57,7 +57,7 @@ let
}; };
optionsDocBook = runCommand "options-db.xml" {} '' optionsDocBook = runCommand "options-db.xml" {} ''
optionsXML=${options'}/doc/share/nixos/options.xml optionsXML=${options'}/share/doc/nixos/options.xml
if grep /nixpkgs/nixos/modules $optionsXML; then if grep /nixpkgs/nixos/modules $optionsXML; then
echo "The manual appears to depend on the location of Nixpkgs, which is bad" echo "The manual appears to depend on the location of Nixpkgs, which is bad"
echo "since this prevents sharing via the NixOS channel. This is typically" echo "since this prevents sharing via the NixOS channel. This is typically"