From 07265a5850345d4e51c74cd7e1ed9a4036dee7a2 Mon Sep 17 00:00:00 2001
From: jared <>
Date: Fri, 2 Feb 2024 20:05:51 -0700
Subject: [PATCH] Migrate `rustFlake` to `flake-lang`

---
 extras/build.nix                              |  7 +----
 runtimes/rust/lbr-prelude-derive/build.nix    |  9 ++----
 runtimes/rust/lbr-prelude/build.nix           |  9 ++----
 .../lbt-plutus/lbt-plutus-rust/build.nix      | 29 +++++--------------
 .../lbt-prelude/lbt-prelude-rust/build.nix    | 24 ++++-----------
 5 files changed, 20 insertions(+), 58 deletions(-)

diff --git a/extras/build.nix b/extras/build.nix
index f120d8b4..c74a8df7 100644
--- a/extras/build.nix
+++ b/extras/build.nix
@@ -23,7 +23,7 @@
 
     # Makes a per system `lbf-nix` option.
     perSystem = flake-parts-lib.mkPerSystemOption
-      ({ pkgs, config, pkgsForRust, ... }: {
+      ({ pkgs, config, ... }: {
 
         options.lbf-nix = lib.mkOption {
           type = lib.types.anything;
@@ -38,11 +38,6 @@
             buildInputs = config.settings.shell.tools;
           };
 
-          lbf-nix = {
-            # NOTE(bladyjoker): If you need to add a function the export externally and use internally via config.lbf-nix, add it here.
-            rustFlake = import ./flake-rust.nix pkgsForRust;
-          };
-
           # Makes it available in the per system `lib` argument.
           _module.args.lib = lib // {
             inherit (config) lbf-nix;
diff --git a/runtimes/rust/lbr-prelude-derive/build.nix b/runtimes/rust/lbr-prelude-derive/build.nix
index 6137ee12..9c65dce7 100644
--- a/runtimes/rust/lbr-prelude-derive/build.nix
+++ b/runtimes/rust/lbr-prelude-derive/build.nix
@@ -1,16 +1,13 @@
 { inputs, ... }: {
-  perSystem = { config, ... }:
+  perSystem = { config, system, ... }:
     let
       rustFlake =
-        config.lbf-nix.rustFlake {
+        inputs.flake-lang.lib.${system}.rustFlake {
           src = ./.;
           inherit (inputs) crane;
           crateName = "lbr-prelude-derive";
           extraSources = [
-            {
-              name = "lbr-prelude";
-              path = config.packages.lbr-prelude-rust-src;
-            }
+            config.packages.lbr-prelude-rust-src
           ];
           devShellHook = config.settings.shell.hook;
         };
diff --git a/runtimes/rust/lbr-prelude/build.nix b/runtimes/rust/lbr-prelude/build.nix
index 34cb3c26..bc1f4f62 100644
--- a/runtimes/rust/lbr-prelude/build.nix
+++ b/runtimes/rust/lbr-prelude/build.nix
@@ -1,16 +1,13 @@
 { inputs, ... }: {
-  perSystem = { config, ... }:
+  perSystem = { config, system, ... }:
     let
       rustFlake =
-        config.lbf-nix.rustFlake {
+        inputs.flake-lang.lib.${system}.rustFlake {
           src = ./.;
           inherit (inputs) crane;
           crateName = "lbr-prelude";
           extraSources = [
-            {
-              name = "lbr-prelude-derive";
-              path = config.packages.lbr-prelude-derive-rust-src;
-            }
+            config.packages.lbr-prelude-derive-rust-src
           ];
           devShellHook = config.settings.shell.hook;
         };
diff --git a/testsuites/lbt-plutus/lbt-plutus-rust/build.nix b/testsuites/lbt-plutus/lbt-plutus-rust/build.nix
index 2af2acd6..1e07388a 100644
--- a/testsuites/lbt-plutus/lbt-plutus-rust/build.nix
+++ b/testsuites/lbt-plutus/lbt-plutus-rust/build.nix
@@ -1,33 +1,18 @@
 { inputs, ... }: {
-  perSystem = { config, ... }:
+  perSystem = { config, system, ... }:
 
     let
-      rustFlake = config.lbf-nix.rustFlake {
+      rustFlake = inputs.flake-lang.lib.${system}.rustFlake {
         src = ./.;
         inherit (inputs) crane;
         crateName = "lbt-plutus";
 
         extraSources = [
-          {
-            name = "lbf-plutus-rust-golden-api";
-            path = config.packages.lbf-plutus-golden-api-rust;
-          }
-          {
-            name = "lbf-prelude";
-            path = config.packages.lbf-prelude-rust;
-          }
-          {
-            name = "lbf-plutus";
-            path = config.packages.lbf-plutus-rust;
-          }
-          {
-            name = "lbr-prelude";
-            path = config.packages.lbr-prelude-rust-src;
-          }
-          {
-            name = "lbr-prelude-derive";
-            path = config.packages.lbr-prelude-derive-rust-src;
-          }
+          config.packages.lbf-plutus-golden-api-rust
+          config.packages.lbf-prelude-rust
+          config.packages.lbf-plutus-rust
+          config.packages.lbr-prelude-rust-src
+          config.packages.lbr-prelude-derive-rust-src
         ];
         data = [
           {
diff --git a/testsuites/lbt-prelude/lbt-prelude-rust/build.nix b/testsuites/lbt-prelude/lbt-prelude-rust/build.nix
index 528d827b..15a1bd29 100644
--- a/testsuites/lbt-prelude/lbt-prelude-rust/build.nix
+++ b/testsuites/lbt-prelude/lbt-prelude-rust/build.nix
@@ -1,29 +1,17 @@
 { inputs, ... }: {
-  perSystem = { config, ... }:
+  perSystem = { config, system, ... }:
 
     let
-      rustFlake = config.lbf-nix.rustFlake {
+      rustFlake = inputs.flake-lang.lib.${system}.rustFlake {
         src = ./.;
         inherit (inputs) crane;
         crateName = "lbt-prelude";
 
         extraSources = [
-          {
-            name = "lbf-prelude-golden-api";
-            path = config.packages.lbf-prelude-golden-api-rust;
-          }
-          {
-            name = "lbf-prelude";
-            path = config.packages.lbf-prelude-rust;
-          }
-          {
-            name = "lbr-prelude";
-            path = config.packages.lbr-prelude-rust-src;
-          }
-          {
-            name = "lbr-prelude-derive";
-            path = config.packages.lbr-prelude-derive-rust-src;
-          }
+          config.packages.lbf-prelude-golden-api-rust
+          config.packages.lbf-prelude-rust
+          config.packages.lbr-prelude-rust-src
+          config.packages.lbr-prelude-derive-rust-src
         ];
         data = [
           {