chore(nix): Granular rust dependency for Haskell package

juspay · Jul 13, 2024 · bf3bc70 · bf3bc70
1 parent 1875d47
commit bf3bc70
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 8 deletions.
diff --git a/clients/haskell/default.nix b/clients/haskell/default.nix
@@ -4,8 +4,8 @@
       projectRoot = ./.;
       autoWire = [ "packages" "checks" "apps" ];
       settings = {
-        cac_client.custom = _: self'.packages.superposition;
-        experimentation_client.custom = _: self'.packages.superposition;
+        cac_client.custom = _: self'.packages.cac_client;
+        experimentation_client.custom = _: self'.packages.experimentation_client;
       };
     };
 

diff --git a/flake.nix b/flake.nix
@@ -42,6 +42,7 @@
             self'.devShells.haskell
             config.pre-commit.devShell
           ];
+          # Add your devShell tools here
           packages = with pkgs; [
             docker-compose
             gnumake
@@ -51,6 +52,11 @@
             jq
             nodejs_18
             nixpkgs-fmt
+            bacon
+            cargo-watch
+            diesel-cli
+            leptosfmt
+            wasm-pack
           ];
         };
       };

diff --git a/rust.nix b/rust.nix
@@ -3,6 +3,34 @@
   perSystem = { config, self', pkgs, lib, system, ... }: {
     rust-project = {
       crates = {
+        "cac_client" = {
+          autoWire = true;
+          crane = {
+            args = {
+              buildInputs = lib.optionals pkgs.stdenv.isDarwin
+                (with pkgs.darwin.apple_sdk.frameworks; [
+                  Security
+                ]) ++ [
+                pkgs.postgresql_12
+                pkgs.openssl
+              ];
+            };
+          };
+        };
+        "experimentation_client" = {
+          autoWire = true;
+          crane = {
+            args = {
+              buildInputs = lib.optionals pkgs.stdenv.isDarwin
+                (with pkgs.darwin.apple_sdk.frameworks; [
+                  Security
+                ]) ++ [
+                pkgs.postgresql_12
+                pkgs.openssl
+              ];
+            };
+          };
+        };
         "superposition" = {
           autoWire = true;
           crane = {
@@ -19,13 +47,7 @@
                 pkgs.postgresql_12
               ];
               nativeBuildInputs = with pkgs; [
-                # Add your Rust dev tools here.
                 pkg-config
-                bacon
-                cargo-watch
-                diesel-cli
-                leptosfmt
-                wasm-pack
               ];
             };
             extraBuildArgs = {