diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-12-14 12:02:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-14 12:02:00 +0000 |
| commit | a292b5fe683e4c8f38f1ef2750be85fba2816f4d (patch) | |
| tree | afbc5a77a9a386c649f61b6b5259356a2443be51 /nixos/lib | |
| parent | f965d7db4a1fcd20442ac599910a8c5e38b54e4c (diff) | |
| parent | 0242879f3fa01bdda5b7e204f963b8e6c258ad54 (diff) | |
| download | nixpkgs-a292b5fe683e4c8f38f1ef2750be85fba2816f4d.tar nixpkgs-a292b5fe683e4c8f38f1ef2750be85fba2816f4d.tar.gz nixpkgs-a292b5fe683e4c8f38f1ef2750be85fba2816f4d.tar.bz2 nixpkgs-a292b5fe683e4c8f38f1ef2750be85fba2816f4d.tar.lz nixpkgs-a292b5fe683e4c8f38f1ef2750be85fba2816f4d.tar.xz nixpkgs-a292b5fe683e4c8f38f1ef2750be85fba2816f4d.tar.zst nixpkgs-a292b5fe683e4c8f38f1ef2750be85fba2816f4d.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/make-options-doc/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 493006c92e7..44bc25be923 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -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" |