Fix build

arximboldi · Aug 8, 2024 · 7357be3 · 7357be3
1 parent 585bfa5
commit 7357be3
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 58 deletions.
diff --git a/extra/fuzzer/persist/flex-vector.cpp b/extra/fuzzer/persist/flex-vector.cpp
@@ -12,8 +12,8 @@
 #include <immer/flex_vector.hpp>
 
 #include <fmt/ranges.h>
-#include <immer/extra/persist/rbts/input.hpp>
-#include <immer/extra/persist/rbts/output.hpp>
+#include <immer/extra/persist/detail/rbts/input.hpp>
+#include <immer/extra/persist/detail/rbts/output.hpp>
 
 #include <array>
 

diff --git a/flake.nix b/flake.nix
@@ -90,62 +90,67 @@
           });
         };
 
-      devShells.default = (withLLVM pkgs.mkShell) {
-        NIX_HARDENING_ENABLE = "";
-        inputsFrom = [
-          (import ./shell.nix {
-            inherit system nixpkgs;
-          })
-        ];
-
-        packages = with pkgs;
-          [
-            # for the llvm-symbolizer binary, that allows to show stacks in ASAN and LeakSanitizer.
-            llvmPackages_latest.bintools-unwrapped
-            cmake-format
-            alejandra
-            just
-            fzf
-            starship
-          ]
-          ++ persist-inputs;
-
-        shellHook =
-          self.checks.${system}.pre-commit-check.shellHook
-          + "\n"
-          + ''
-            alias j=just
-            eval "$(starship init bash)"
-          '';
-      };
-
-      devShells.docs = let
-        docsPkgs = import docs-nixpkgs {inherit system;};
-        docs = docsPkgs.callPackage ./nix/docs.nix {};
-      in
-        pkgs.mkShell {
-          packages = [
-            pkgs.just
-            pkgs.fzf
-            pkgs.starship
-            pkgs.cmake
-            pkgs.ninja
-
-            docsPkgs.doxygen
-            (docsPkgs.python.withPackages (ps: [
-              ps.sphinx
-              docs.breathe
-              docs.recommonmark
-            ]))
-          ];
-
-          shellHook =
-            self.checks.${system}.pre-commit-check.shellHook
-            + "\n"
-            + ''
-              alias j=just
-              eval "$(starship init bash)"
-            '';
+      devShells =
+        {
+          default = (withLLVM pkgs.mkShell) {
+            NIX_HARDENING_ENABLE = "";
+            inputsFrom = [
+              (import ./shell.nix {
+                inherit system nixpkgs;
+              })
+            ];
+
+            packages = with pkgs;
+              [
+                # for the llvm-symbolizer binary, that allows to show stacks in ASAN and LeakSanitizer.
+                llvmPackages_latest.bintools-unwrapped
+                cmake-format
+                alejandra
+                just
+                fzf
+                starship
+              ]
+              ++ persist-inputs;
+
+            shellHook =
+              self.checks.${system}.pre-commit-check.shellHook
+              + "\n"
+              + ''
+                alias j=just
+                eval "$(starship init bash)"
+              '';
+          };
+        }
+        // pkgs.lib.optionalAttrs pkgs.stdenv.isLinux {
+          # doxygen doesn't work on macOS currently
+          docs = let
+            docsPkgs = import docs-nixpkgs {inherit system;};
+            docs = docsPkgs.callPackage ./nix/docs.nix {};
+          in
+            pkgs.mkShell {
+              packages = [
+                pkgs.just
+                pkgs.fzf
+                pkgs.starship
+                pkgs.cmake
+                pkgs.ninja
+
+                docsPkgs.doxygen
+                (docsPkgs.python.withPackages (ps: [
+                  ps.sphinx
+                  docs.breathe
+                  docs.recommonmark
+                ]))
+              ];
+
+              shellHook =
+                self.checks.${system}.pre-commit-check.shellHook
+                + "\n"
+                + ''
+                  alias j=just
+                  eval "$(starship init bash)"
+                '';
+            };
         };
 
       packages = {