Skip to content

Commit

Permalink
nix: Fix doxygen override causing local builds
Browse files Browse the repository at this point in the history
Moving the custom doxygen version to a separate attribute rather than overriding the original doxygen property fixes the issue. Quite a lot of packages depend on doxygen as a build input
  • Loading branch information
RandomSpaceship committed Dec 12, 2024
1 parent 73c63b0 commit 447b575
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ let
name = "roar-docs-env";
paths = [
pyEnv
unstable.doxygen
unstable.doxygen12
graphviz
];
};
Expand Down
4 changes: 2 additions & 2 deletions docs/nix/overlay.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
final: prev:
let
doxygen = prev.doxygen.overrideAttrs (
doxygen12 = prev.doxygen.overrideAttrs (
{ ... }:
rec {
version = "1.12.0";
Expand All @@ -16,5 +16,5 @@ let
);
in
{
inherit doxygen;
inherit doxygen12;
}
4 changes: 2 additions & 2 deletions treefmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ includes = ["*.c", "*.cc", "*.cpp", "*.h", "*.hh", "*.hpp"]
options = ["-i"]

[formatter.cmake-format]
command = "/nix/store/9ijpfiihb5hnwy5s6fag0c196z71ycfb-cmake-format-0.6.13/bin/cmake-format"
command = "/nix/store/br5n4f9z6ybfln4k6044rgdrkmdm94bb-cmake-format-0.6.13/bin/cmake-format"
excludes = []
includes = ["CMakeLists.txt", "**/CMakeLists.txt", "**/*.cmake", "*.cmake", "CMakeLists.txt"]
options = ["--in-place"]
Expand All @@ -35,7 +35,7 @@ includes = ["*.nix"]
options = []

[formatter.prettier]
command = "/nix/store/9hwlvnn35g296w83m1088sf1lng0cv9d-prettier-3.3.3/bin/prettier"
command = "/nix/store/1bi5k3m7n4wldvgfzbfiqw1mzpb6jy0l-prettier-3.3.3/bin/prettier"
excludes = []
includes = ["*.cjs", "*.css", "*.html", "*.js", "*.json", "*.json5", "*.jsx", "*.md", "*.mdx", "*.mjs", "*.scss", "*.ts", "*.tsx", "*.vue", "*.yaml", "*.yml"]
options = ["--write"]
Expand Down

0 comments on commit 447b575

Please sign in to comment.