Unverified Commit ecb78096 authored by Yt's avatar Yt Committed by GitHub
Browse files

cargo-tauri: 2.9.6 -> 2.11.0 (#515363)

parents 6a3f1fc4 ebb711af
Loading
Loading
Loading
Loading
+9 −3
Original line number Diff line number Diff line
@@ -14,21 +14,27 @@

rustPlatform.buildRustPackage (finalAttrs: {
  pname = "tauri";
  version = "2.9.6";
  version = "2.11.0";

  src = fetchFromGitHub {
    owner = "tauri-apps";
    repo = "tauri";
    tag = "tauri-cli-v${finalAttrs.version}";
    hash = "sha256-VtZxFkxOLMNwl3A/2qoNJ/HXr5FXFKQYw+ri5Yp8eOE=";
    hash = "sha256-hbTpLeWMc5nSJeq1vWKbVpfhp1KZjiBgmaiQMUs/MIQ=";
  };

  cargoHash = "sha256-uAjEQBHDpVv73MbeoU86tObiXSUKKjImpMTLHXKMRNs=";
  cargoHash = "sha256-PrvlPfK/9qyBWOs6hG3C3w9TMK7p1TCoKpjSWkhN2rY=";

  nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
    pkg-config
  ];

  # Explicitly enable optional `rustls` dependency.
  postPatch = ''
    substituteInPlace crates/tauri/Cargo.toml \
      --replace-fail 'dep:rustls' 'rustls'
  '';

  buildInputs =
    # Required for tauri-macos-sign and RPM support in tauri-bundler
    lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
    pnpm = pnpm_9;

    fetcherVersion = 3;
    hash = "sha256-/g+2jZQq3nTJnKpj0PlT6zB3UcUBE2ND8797XRwVZ0s=";
    hash = "sha256-DiRho0tmR/4XJi7cAZxesVA1iR8uiwknCfmIP2x9i5I=";
  };

  nativeBuildInputs = [
+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ cargo-tauri.overrideAttrs (

    patches = [ ];

    postPatch = "";

    # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
    # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
    sourceRoot = "${finalAttrs.src.name}/tooling/cli";