From e3f4a57fb81644cdf71d334760b5713db168145a Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Fri, 23 May 2025 21:13:06 +0100 Subject: [PATCH] docs/mdbook: install directly to `$out` This fixes a regression introduced by https://github.com/nix-community/nixvim/pull/3349 --- .github/workflows/build_documentation.yml | 2 +- docs/mdbook/default.nix | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_documentation.yml b/.github/workflows/build_documentation.yml index 93d552cf..5680b73d 100644 --- a/.github/workflows/build_documentation.yml +++ b/.github/workflows/build_documentation.yml @@ -110,7 +110,7 @@ jobs: # Copy the result to the install dir mkdir -p "$installDir" - cp -r result/share/doc/* "$installDir" + cp -r result/* "$installDir" } # For each version of the docs... diff --git a/docs/mdbook/default.nix b/docs/mdbook/default.nix index d8e77970..b7f65563 100644 --- a/docs/mdbook/default.nix +++ b/docs/mdbook/default.nix @@ -349,8 +349,7 @@ pkgs.stdenv.mkDerivation (finalAttrs: { contributing = finalAttrs.passthru.fix-links ../../CONTRIBUTING.md; buildPhase = '' - dest=$out/share/doc - mkdir -p $dest + mkdir -p $out # Copy (and flatten) src into the build directory cp -r --no-preserve=all $src/* ./ @@ -397,9 +396,9 @@ pkgs.stdenv.mkDerivation (finalAttrs: { --replace-fail "@USER_CONFIGS@" "$(cat ${finalAttrs.passthru.user-configs})" mdbook build - cp -r ./book/* $dest - mkdir -p $dest/search - cp -r ${finalAttrs.passthru.search}/* $dest/search + cp -r ./book/* $out + mkdir -p $out/search + cp -r ${finalAttrs.passthru.search}/* $out/search ''; inherit baseHref;