From 336943d99c9b210f0cbf1e58b080f6fdedc5205f Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Sun, 18 Feb 2024 23:13:53 +0000 Subject: [PATCH] flake: some improvements Development tools should be nativeBuildInputs. Also added a clang version of the dev shell. Signed-off-by: Yuxuan Shui --- flake.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 59956ac6..d77180e3 100644 --- a/flake.nix +++ b/flake.nix @@ -43,19 +43,20 @@ overlays ; defaultPackage = pkgs.picom; - devShell = defaultPackage.overrideAttrs { - buildInputs = - defaultPackage.buildInputs - ++ (with pkgs; [ - clang-tools_17 - llvmPackages_17.clang-unwrapped.python - ]); + devShells.default = defaultPackage.overrideAttrs (o: { + nativeBuildInputs = o.nativeBuildInputs ++ (with pkgs; [ + clang-tools_17 + llvmPackages_17.clang-unwrapped.python + ]); hardeningDisable = ["fortify"]; shellHook = '' # Workaround a NixOS limitation on sanitizers: # See: https://github.com/NixOS/nixpkgs/issues/287763 export LD_LIBRARY_PATH+=":/run/opengl-driver/lib" ''; + }); + devShells.useClang = devShells.default.override { + inherit (pkgs.llvmPackages_17) stdenv; }; }); }