Fix flake builder -- again (#114)

* Update rust compiler version * Adding fenix * Fix errors? * Ditching fenix * Roll back the compiler upgrade * Bump the version --------- Co-authored-by: Colt Frederickson <[email protected]>
IronCoreLabs · Sep 10, 2024 · 8df8447 · 8df8447
1 parent 4c9d609
commit 8df8447
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 42 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ironhide"
-version = "1.0.8"
+version = "1.0.9"
 authors = ["IronCore Labs <[email protected]>"]
 categories = ["cryptography"]
 description = "Tool to easily encrypt and decrypt files to users and groups. Similar to GPG, but usable at scale."

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -12,7 +12,6 @@
     nixpkgs,
     rust-overlay,
     flake-utils,
-    ...
   }:
     flake-utils.lib.eachDefaultSystem (system: let
       overlays = [(import rust-overlay)];
@@ -23,25 +22,31 @@
     in rec {
       # `nix build`
       packages = {
-        ironhide = pkgs.rustPlatform.buildRustPackage {
-          pname = cargoToml.package.name;
-          version = cargoToml.package.version;
-          src = ./.;
-          cargoLock.lockFile = ./Cargo.lock;
-          nativeBuildInputs = with pkgs;
-            [rusttoolchain]
-            ++ pkgs.lib.optionals pkgs.stdenv.isDarwin
-            (with pkgs.darwin.apple_sdk.frameworks; [Security SystemConfiguration]);
-        };
+        ironhide =
+          (pkgs.makeRustPlatform {
+            cargo = rusttoolchain;
+            rustc = rusttoolchain;
+          })
+          .buildRustPackage {
+            # ironhide = pkgs.rustPlatform.buildRustPackage {
+            pname = cargoToml.package.name;
+            inherit (cargoToml.package) version;
+            src = ./.;
+            cargoLock.lockFile = ./Cargo.lock;
+            nativeBuildInputs = with pkgs;
+              [rusttoolchain]
+              ++ lib.optionals stdenv.isDarwin
+              (with darwin.apple_sdk.frameworks; [Security SystemConfiguration]);
+          };
         default = packages.ironhide;
       };
 
       # nix develop
       devShells.default = pkgs.mkShell {
         buildInputs = with pkgs;
           [rusttoolchain]
-          ++ pkgs.lib.optionals pkgs.stdenv.isDarwin
-          (with pkgs.darwin.apple_sdk.frameworks; [Security SystemConfiguration]);
+          ++ lib.optionals stdenv.isDarwin
+          (with darwin.apple_sdk.frameworks; [Security SystemConfiguration]);
       };
     });
 }