Skip to content

Commit e3f4a57

Browse files
committed
docs/mdbook: install directly to $out
This fixes a regression introduced by #3349
1 parent 4dc8d1e commit e3f4a57

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/build_documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
111111
# Copy the result to the install dir
112112
mkdir -p "$installDir"
113-
cp -r result/share/doc/* "$installDir"
113+
cp -r result/* "$installDir"
114114
}
115115
116116
# For each version of the docs...

docs/mdbook/default.nix

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,7 @@ pkgs.stdenv.mkDerivation (finalAttrs: {
349349
contributing = finalAttrs.passthru.fix-links ../../CONTRIBUTING.md;
350350

351351
buildPhase = ''
352-
dest=$out/share/doc
353-
mkdir -p $dest
352+
mkdir -p $out
354353
355354
# Copy (and flatten) src into the build directory
356355
cp -r --no-preserve=all $src/* ./
@@ -397,9 +396,9 @@ pkgs.stdenv.mkDerivation (finalAttrs: {
397396
--replace-fail "@USER_CONFIGS@" "$(cat ${finalAttrs.passthru.user-configs})"
398397
399398
mdbook build
400-
cp -r ./book/* $dest
401-
mkdir -p $dest/search
402-
cp -r ${finalAttrs.passthru.search}/* $dest/search
399+
cp -r ./book/* $out
400+
mkdir -p $out/search
401+
cp -r ${finalAttrs.passthru.search}/* $out/search
403402
'';
404403

405404
inherit baseHref;

0 commit comments

Comments
 (0)