diff --git a/flake.nix b/flake.nix
index 96f3740..fdc68a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,9 +9,9 @@
       pkgs = import nixpkgs { inherit system; };
       inherit (pkgs) lib;
     in {
-      devShells.${system}.default = pkgs.mkShell {
-        buildInputs = with pkgs; [
-          clang
+      devShells.${system}.default = pkgs.mkShell.override { stdenv = pkgs.clangStdenv; } {
+        packages = with pkgs; [
+          clang-tools
         ];
       };
 
@@ -25,13 +25,19 @@
         };
       in {
         default = self.packages.${system}.wamf;
-        wamf = pkgs.callPackage ./nix/package.nix { inherit src; };
+        wamf = pkgs.callPackage ./nix/package.nix {
+          inherit src;
+          stdenv = pkgs.clangStdenv;
+        };
         wamf-freebsd-cross = let
           pkgs = import nixpkgs {
             localSystem = system;
             crossSystem = "x86_64-freebsd";
           };
-        in pkgs.callPackage ./nix/package.nix { inherit src; };
+        in pkgs.callPackage ./nix/package.nix {
+          inherit src;
+          stdenv = pkgs.clangStdenv;
+        };
       };
     };
 }