From b4b8d6bf89441cb695371a3571b7e1e0b5f55c9b Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 12 May 2026 20:36:28 +0900 Subject: [PATCH 1/2] flake.nix: fix use of clang in devshell --- flake.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 96f3740..1fe356f 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 ]; }; -- 2.54.0 From c2ccda259859dca62bd60d6b0f9ddec3928fe412 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 12 May 2026 20:36:36 +0900 Subject: [PATCH 2/2] flake.nix: build packages with clang --- flake.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 1fe356f..fdc68a2 100644 --- a/flake.nix +++ b/flake.nix @@ -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; + }; }; }; } -- 2.54.0