Merge branch 'no-more-naersk'

* no-more-naersk: Remove naersk from flake deps
andrew-d · Dec 2, 2021 · 0bd2a46 · 0bd2a46
2 parents 74f6604 + 4b87d1c
commit 0bd2a46
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 45 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,26 +3,29 @@
 
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
-    naersk.url = "github:nmattia/naersk";
   };
 
-  outputs = { self, nixpkgs, flake-utils, naersk, ... }:
+  outputs = { self, nixpkgs, flake-utils, ... }:
     flake-utils.lib.eachDefaultSystem
       (system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
-          naersk-lib = naersk.lib."${system}";
-          nativeBuildInputs = with pkgs; [ pkgconfig zfs zfs.dev ];
+          nativeBuildInputs = with pkgs; [ pkgconfig zfs.dev ];
         in
         rec {
           devShell =
             pkgs.mkShell {
               inherit nativeBuildInputs;
             };
 
-          packages.zpool-exporter-textfile = naersk-lib.buildPackage {
+          packages.zpool-exporter-textfile = pkgs.rustPlatform.buildRustPackage rec {
+            pname = "zpool-exporter-textfile";
+            version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.version;
             inherit nativeBuildInputs;
             src = ./.;
+            cargoLock.lockFile = ./Cargo.lock;
+
+            buildInputs = nativeBuildInputs;
           };
 
           defaultPackage = packages.zpool-exporter-textfile;