X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=flake.nix;h=b8f9ce58d01f413fd2c6ca8dbfe47c6674e3b6b8;hb=HEAD;hp=93480c1bc899b6fe71822c889544026e6f31a2ed;hpb=10c609ac941c132f4dc7d29aab4bd1bf5f735c24;p=bcachefs-tools-debian

diff --git a/flake.nix b/flake.nix
index 93480c1..b8f9ce5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,20 +10,31 @@
   };
 
   outputs = { self, nixpkgs, utils, ... }:
-    utils.lib.eachDefaultSystem (system:
+    {
+      overlays.default = final: prev: {
+        bcachefs = final.callPackage ./build.nix { };
+      };
+    } // utils.lib.eachDefaultSystem (system:
       let
-        pkgs = nixpkgs.legacyPackages.${system};
-        binary = pkgs.callPackage ./binary.nix {
-            testWithValgrind = false;
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [ self.overlays.default ];
         };
-        mount = pkgs.callPackage ./rust-src/default.nix { inherit binary; };
-        bcachefs = pkgs.callPackage ./base.nix {
-          inherit binary mount;
-          };
       in {
         packages = {
-          inherit binary mount;
-          default = bcachefs;
+          inherit (pkgs) bcachefs;
+          bcachefs-fuse = pkgs.bcachefs.override { fuseSupport = true; };
+          default = pkgs.bcachefs;
         };
+
+        formatter = pkgs.nixfmt;
+
+        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;
+          }) { };
       });
 }