Use updated flake.nix borrowed from #56

elsirion · Feb 12, 2024 · e4f8a7a · e4f8a7a
1 parent 8a3cfdd
commit e4f8a7a
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 113 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,28 +1,66 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flakebox = {
+      url = "github:rustshop/flakebox";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     flake-utils.url = "github:numtide/flake-utils";
-    fedimint.url = "github:fedimint/fedimint";
   };
 
-  outputs = { self, nixpkgs, flake-utils, fedimint, ... }:
+  outputs = { self, nixpkgs, flakebox, flake-utils, ... }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {
           inherit system;
           config.allowUnfree = true;
         };
+        flakeboxLib = flakebox.lib.${system} { };
+        rustSrc = flakeboxLib.filterSubPaths {
+          root = builtins.path {
+            name = "webimint";
+            path = ./.;
+          };
+          paths = [ "Cargo.toml" "Cargo.lock" ".cargo" "src" ];
+        };
+        toolchainsWasm = (pkgs.lib.getAttrs
+          [
+            "default"
+            "wasm32-unknown"
+          ]
+          (flakeboxLib.mkStdFenixToolchains { })
+        );
+        toolchainWasm = flakeboxLib.mkFenixMultiToolchain {
+          toolchains = toolchainsWasm;
+        };
         target = "wasm32-unknown-unknown";
-      in
+
+        outputs = (flakeboxLib.craneMultiBuild { }) (craneLib':
+          let
+            craneLib = (craneLib'.overrideArgs {
+              pname = "flexbox-multibuild";
+              src = rustSrc;
+            });
+          in rec {
+            workspaceDeps = craneLib.buildWorkspaceDepsOnly { };
+            workspaceBuild =
+              craneLib.buildWorkspace { cargoArtifacts = workspaceDeps; };
+            webimint = craneLib.buildPackage { };
+          });
+    in
     {
-      devShells.default = pkgs.mkShell {
-        inputsFrom = [ fedimint.devShells."${system}".crossWasm ];
+      legacyPackages = outputs;
+      devShells = flakeboxLib.mkShells {
+        toolchain = toolchainWasm;
+        packages = [ ];
         CC_wasm32_unknown_unknown = "${pkgs.llvmPackages_15.clang-unwrapped}/bin/clang-15";
         # -Wno-macro-redefined fixes ring building
         CFLAGS_wasm32_unknown_unknown = "-I ${pkgs.llvmPackages_15.libclang.lib}/lib/clang/15.0.7/include/ -Wno-macro-redefined";
         nativeBuildInputs = with pkgs; [ 
-          nodejs
           trunk
+          wasm-pack
+          wasm-bindgen-cli
+          nodejs
           nodePackages.tailwindcss 
         ];
       };