From 8d39c0c19638eb0cd07c1d0af89320e33f9c02d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.dev>
Date: Thu, 14 Dec 2023 23:14:59 +0100
Subject: [PATCH 1/2] Fix clang devshell

Issue introduced in https://github.com/NixOS/nix/pull/9535
---
 package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package.nix b/package.nix
index 24395b484..6ea5bf9c9 100644
--- a/package.nix
+++ b/package.nix
@@ -5,6 +5,7 @@
 , autoreconfHook
 , aws-sdk-cpp
 , boehmgc
+, buildPackages
 , nlohmann_json
 , bison
 , boost
@@ -207,6 +208,9 @@ in {
     # changelog
     ++ lib.optional (!officialRelease && buildUnreleasedNotes) changelog-d
     ++ lib.optional enableInternalAPIDocs doxygen
+
+    ++ lib.optional stdenv.cc.isClang buildPackages.bear
+    ++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) buildPackages.clang-tools
   ;
 
   buildInputs = lib.optionals doBuild [

From 66d37b73383e40f0362b82a0e29c60d2913d689a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.dev>
Date: Fri, 15 Dec 2023 12:41:38 +0100
Subject: [PATCH 2/2] Move clang dev deps to the nix devshell override

---
 flake.nix   | 5 ++++-
 package.nix | 4 ----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index eb3846564..8c4436729 100644
--- a/flake.nix
+++ b/flake.nix
@@ -395,7 +395,7 @@
           stdenvs)));
 
       devShells = let
-        makeShell = pkgs: stdenv: (pkgs.nix.override { inherit stdenv; }).overrideAttrs (_: {
+        makeShell = pkgs: stdenv: (pkgs.nix.override { inherit stdenv; }).overrideAttrs (attrs: {
           installFlags = "sysconfdir=$(out)/etc";
           shellHook = ''
             PATH=$prefix/bin:$PATH
@@ -405,6 +405,9 @@
             # Make bash completion work.
             XDG_DATA_DIRS+=:$out/share
           '';
+          nativeBuildInputs = attrs.nativeBuildInputs or []
+            ++ lib.optional stdenv.cc.isClang pkgs.buildPackages.bear
+            ++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) pkgs.buildPackages.clang-tools;
         });
         in
         forAllSystems (system:
diff --git a/package.nix b/package.nix
index 6ea5bf9c9..24395b484 100644
--- a/package.nix
+++ b/package.nix
@@ -5,7 +5,6 @@
 , autoreconfHook
 , aws-sdk-cpp
 , boehmgc
-, buildPackages
 , nlohmann_json
 , bison
 , boost
@@ -208,9 +207,6 @@ in {
     # changelog
     ++ lib.optional (!officialRelease && buildUnreleasedNotes) changelog-d
     ++ lib.optional enableInternalAPIDocs doxygen
-
-    ++ lib.optional stdenv.cc.isClang buildPackages.bear
-    ++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) buildPackages.clang-tools
   ;
 
   buildInputs = lib.optionals doBuild [