From 20b282da75d816cca2c6fb30b39d340569020622 Mon Sep 17 00:00:00 2001
From: adamjhf <git@freeth.dev>
Date: Wed, 21 May 2025 11:56:28 +0000
Subject: [PATCH] cargo-leptos: 0.2.28 -> 0.2.35

cargo-leptos: 0.2.28 -> 0.2.35

cargo-leptos: fix darwin

cargo-leptos: remove vendored-openssl

cargo-leptos: fix idmail build

x

cargo-leptos 2

cargo-leptos

remove idmail change

revert idmail
---
 pkgs/by-name/ca/cargo-leptos/package.nix | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix
index 21527f9b2e59..cffa2be21f6e 100644
--- a/pkgs/by-name/ca/cargo-leptos/package.nix
+++ b/pkgs/by-name/ca/cargo-leptos/package.nix
@@ -1,21 +1,37 @@
 {
   fetchFromGitHub,
   lib,
+  stdenv,
   rustPlatform,
+  pkg-config,
+  openssl,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "cargo-leptos";
-  version = "0.2.28";
+  version = "0.2.35";
 
   src = fetchFromGitHub {
     owner = "leptos-rs";
     repo = "cargo-leptos";
     rev = "v${version}";
-    hash = "sha256-SjpfM963Zux+H5QhK8prvDLuI56fP5PqX5gcVbthRx4=";
+    hash = "sha256-CNktytEm6+5QTPAlxNz07+s7gue9dA5zZM82YQOWFSw=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Da9ei4yAOfhSQmQgrUDZCmMeJXTfGnYhI1+L0JT/ECs=";
+  cargoHash = "sha256-O/JyB47UP6rLeAG1rt1dXhaKfZ71QPg7qAeciHAvrAk=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
+
+  env =
+    {
+      OPENSSL_NO_VENDOR = 1;
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+      # Fix for C++ compiler version on darwin for wasm-opt
+      CRATE_CC_NO_DEFAULTS = 1;
+    };
 
   # https://github.com/leptos-rs/cargo-leptos#dependencies
   buildFeatures = [ "no_downloads" ]; # cargo-leptos will try to install missing dependencies on its own otherwise