diff --git a/.github/workflows/build_documentation.yml b/.github/workflows/build_documentation.yml index 6b7f6381..92b500db 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 1e45a023..b11179f0 100644 --- a/docs/mdbook/default.nix +++ b/docs/mdbook/default.nix @@ -318,8 +318,7 @@ pkgs.stdenv.mkDerivation (finalAttrs: { }; 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/* ./ @@ -350,9 +349,9 @@ pkgs.stdenv.mkDerivation (finalAttrs: { --replace-fail "@DOCS_VERSIONS@" "$(cat ${finalAttrs.passthru.docs-versions})" 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; diff --git a/flake-modules/dev/devshell.nix b/flake-modules/dev/devshell.nix index ea0fe542..66f2ed79 100644 --- a/flake-modules/dev/devshell.nix +++ b/flake-modules/dev/devshell.nix @@ -103,7 +103,7 @@ echo -e "\n=> You can then open your browser to view the doc\n" - (cd "$doc_derivation"/share/doc && ${pkgs.lib.getExe pkgs.python3} ${./server.py}) + (cd "$doc_derivation" && ${pkgs.lib.getExe pkgs.python3} ${./server.py}) ''; } {