summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Mühlbacher <tmuehlbacher@posteo.net>2024-05-22 20:51:00 +0200
committerThomas Mühlbacher <tmuehlbacher@posteo.net>2024-05-22 22:35:05 +0200
commit5e9d1953a2b36f1cd93af3638698d80266b2b623 (patch)
tree894acfbe44f685b9e3ea1af156ee2de33785486b
parenteccefb381d8b3fe12d1d2142d2dd04543546d44d (diff)
build(nix): simplify devShell
much more DRY. Signed-off-by: Thomas Mühlbacher <tmuehlbacher@posteo.net>
-rw-r--r--flake.nix32
1 files changed, 6 insertions, 26 deletions
diff --git a/flake.nix b/flake.nix
index 591d325e..d903bea8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,7 @@
overlays = [ self.overlays.default ];
};
in
- {
+ rec {
packages = {
inherit (pkgs) bcachefs;
bcachefs-fuse = pkgs.bcachefs.override { fuseSupport = true; };
@@ -39,31 +39,11 @@
formatter = pkgs.nixfmt-rfc-style;
- devShells.default = pkgs.callPackage (
- {
- mkShell,
- rustc,
- cargo,
- gnumake,
- gcc,
- clang,
- pkg-config,
- libuuid,
- libsodium,
- keyutils,
- liburcu,
- zlib,
- libaio,
- zstd,
- lz4,
- udev,
- bcachefs,
- }:
- mkShell {
- LIBCLANG_PATH = "${clang.cc.lib}/lib";
- inherit (bcachefs) nativeBuildInputs buildInputs;
- }
- ) { };
+ devShells.default = pkgs.mkShell {
+ inputsFrom = [ packages.default ];
+
+ LIBCLANG_PATH = "${pkgs.clang.cc.lib}/lib";
+ };
}
);
}