Merge pull request #150631 from pennae/fix-option-docs-nix23

nixos/lib/make-options-doc: fix with nix 2.3
This commit is contained in:
Silvan Mosberger 2021-12-14 11:58:41 +01:00 committed by GitHub
commit d995f2abb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -118,8 +118,9 @@ in rec {
# The actual generation of the xml file is done in nix purely for the convenience
# of not having to generate the xml some other way
optionsXML = pkgs.runCommand "options.xml" {} ''
export NIX_STORE_DIR=$TMPDIR/store
export NIX_STATE_DIR=$TMPDIR/state
${pkgs.nix}/bin/nix-instantiate \
--store dummy:// \
--eval --xml --strict ${./optionsJSONtoXML.nix} \
--argstr file ${optionsJSON}/share/doc/nixos/options.json \
> "$out"