diff options
| author | pennae <github@quasiparticle.net> | 2023-06-24 22:14:37 +0200 |
|---|---|---|
| committer | pennae <github@quasiparticle.net> | 2023-07-01 20:27:29 +0200 |
| commit | b521f451a3b2dcee1c72cd11a87d14249b125ce9 (patch) | |
| tree | 11e166ba8b9bfa62228817b718e7f67f99035004 /doc/doc-support | |
| parent | a5414c29a06be9e00d1318cdeb609a42586a976a (diff) | |
| download | nixpkgs-b521f451a3b2dcee1c72cd11a87d14249b125ce9.tar nixpkgs-b521f451a3b2dcee1c72cd11a87d14249b125ce9.tar.gz nixpkgs-b521f451a3b2dcee1c72cd11a87d14249b125ce9.tar.bz2 nixpkgs-b521f451a3b2dcee1c72cd11a87d14249b125ce9.tar.lz nixpkgs-b521f451a3b2dcee1c72cd11a87d14249b125ce9.tar.xz nixpkgs-b521f451a3b2dcee1c72cd11a87d14249b125ce9.tar.zst nixpkgs-b521f451a3b2dcee1c72cd11a87d14249b125ce9.zip | |
doc-support: don't expose locationsXml
nothing except function docs uses this, so we need not expose it. we'll be reworking this entire section of the build anyway, with the target of breaking up doc-support as it is now.
Diffstat (limited to 'doc/doc-support')
| -rw-r--r-- | doc/doc-support/default.nix | 4 | ||||
| -rw-r--r-- | doc/doc-support/lib-function-docs.nix | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/doc/doc-support/default.nix b/doc/doc-support/default.nix index cfa7cbdc828..b1d55c10e82 100644 --- a/doc/doc-support/default.nix +++ b/doc/doc-support/default.nix @@ -18,8 +18,7 @@ let { name = "cli"; description = "command-line serialization functions"; } ]; - locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs libsets; }; - functionDocs = import ./lib-function-docs.nix { inherit locationsXml pkgs libsets; }; + functionDocs = import ./lib-function-docs.nix { inherit pkgs nixpkgs libsets; }; version = pkgs.lib.version; epub-xsl = pkgs.writeText "epub.xsl" '' @@ -69,7 +68,6 @@ in pkgs.runCommand "doc-support" {} mkdir result ( cd result - ln -s ${locationsXml} ./function-locations.xml ln -s ${functionDocs} ./function-docs ln -s ${optionsDoc.optionsDocBook} ./config-options.docbook.xml diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix index cf218fa7040..1d9a056c529 100644 --- a/doc/doc-support/lib-function-docs.nix +++ b/doc/doc-support/lib-function-docs.nix @@ -1,8 +1,13 @@ # Generates the documentation for library functions via nixdoc. -{ pkgs, locationsXml, libsets }: +{ pkgs, nixpkgs, libsets }: -with pkgs; stdenv.mkDerivation { +with pkgs; + +let + locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs libsets; }; +in +stdenv.mkDerivation { name = "nixpkgs-lib-docs"; src = ../../lib; |