diff options
| author | Philip Taron | 2024-07-26 11:50:12 -0700 |
|---|---|---|
| committer | Philip Taron | 2024-07-26 13:46:13 -0700 |
| commit | b846df0a2e241fb0b6e0e987af977f1238520574 (patch) | |
| tree | 1fbb391222a48198257a6f1edc667a21019b3033 /doc | |
| parent | eaa78111043c898f26e870668593299526ae5db1 (diff) | |
nixpkgs-manual: inline common.nix
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/common.nix | 4 | ||||
| -rw-r--r-- | doc/doc-support/package.nix | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/doc/common.nix b/doc/common.nix deleted file mode 100644 index 56f723eb6bd7..000000000000 --- a/doc/common.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - outputPath = "share/doc/nixpkgs"; - indexPath = "manual.html"; -} diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index ec9f524df436..602cef59677e 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -10,10 +10,6 @@ nixpkgs ? { }, }: -let - common = import ../common.nix; -in - stdenvNoCC.mkDerivation ( finalAttrs: let @@ -78,15 +74,15 @@ stdenvNoCC.mkDerivation ( ''; installPhase = '' - dest="$out/${common.outputPath}" + dest="$out/share/doc/nixpkgs" mkdir -p "$(dirname "$dest")" mv out "$dest" - mv "$dest/index.html" "$dest/${common.indexPath}" + mv "$dest/index.html" "$dest/manual.html" cp ${epub} "$dest/nixpkgs-manual.epub" mkdir -p $out/nix-support/ - echo "doc manual $dest ${common.indexPath}" >> $out/nix-support/hydra-build-products + echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products ''; @@ -101,7 +97,7 @@ stdenvNoCC.mkDerivation ( shell = callPackage ../../pkgs/tools/nix/web-devmode.nix { buildArgs = "./."; - open = "/${common.outputPath}/${common.indexPath}"; + open = "/share/doc/nixpkgs/manual.html"; }; tests.manpage-urls = callPackage ../tests/manpage-urls.nix { }; |