Unverified Commit 9ae02ff8 authored by seth's avatar seth
Browse files

treewide: adopt new cargo-tauri versions

parent a6e5c11c

pkgs/by-name/al/alcom/package.nix

+2 −2
Original line number Diff line number Diff line 
{

  buildDotnetModule,

  cargo-about,

  cargo-tauri,

  cargo-tauri_1,

  dotnetCorePackages,

  fetchFromGitHub,

  fetchNpmDeps,
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage { 


  nativeBuildInputs = [

    cargo-about

    cargo-tauri.hook

    cargo-tauri_1.hook

    dotnetSdk

    nodejs

    npmHooks.npmConfigHook

pkgs/by-name/al/alexandria/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
  fetchNpmDeps,

  gtk3,

  wrapGAppsHook3,

  cargo-tauri,

  cargo-tauri_1,

}:



rustPlatform.buildRustPackage rec {
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { 
  };



  nativeBuildInputs = [

    cargo-tauri.hook

    cargo-tauri_1.hook

    nodejs

    npmHooks.npmConfigHook

    pkg-config

pkgs/by-name/ci/cinny-desktop/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  darwin,

  fetchFromGitHub,

  rustPlatform,

  cargo-tauri,

  cargo-tauri_1,

  cinny,

  desktop-file-utils,

  wrapGAppsHook3,
@@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { 
  nativeBuildInputs = [

    wrapGAppsHook3

    pkg-config

    cargo-tauri.hook

    cargo-tauri_1.hook

    desktop-file-utils

  ];

pkgs/by-name/en/en-croissant/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


  pnpm_9,

  nodejs,

  cargo-tauri,

  cargo-tauri_1,

  pkg-config,

  wrapGAppsHook3,

  makeBinaryWrapper,
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { 
    [

      pnpm_9.configHook

      nodejs

      cargo-tauri.hook

      cargo-tauri_1.hook

      pkg-config

    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]

pkgs/by-name/ga/gale/package.nix

+1 −22
Original line number Diff line number Diff line
@@ -16,27 +16,6 @@ 
  webkitgtk_4_1,

}:



let

  cargo-tauri_2 =

    let

      pname = "cargo-tauri";

      version = "2.0.0-rc.3";

      src = fetchFromGitHub {

        owner = "tauri-apps";

        repo = "tauri";

        rev = "tauri-v${version}";

        hash = "sha256-PV8m/MzYgbY4Hv71dZrqVbrxmxrwFfOAraLJIaQk6FQ=";

      };

    in

    cargo-tauri.overrideAttrs {

      inherit src version;

      cargoDeps = rustPlatform.fetchCargoTarball {

        inherit pname version src;

        sourceRoot = "${src.name}/tooling/cli";

        hash = "sha256-JPlMaoPw6a7D20KQH7iuhHKfGT5oUKf55tMaMYEM/Z4=";

      };

    };

in

stdenv.mkDerivation (finalAttrs: {

  pname = "gale";

  version = "0.8.11";
@@ -68,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { 
    npmHooks.npmConfigHook

    nodejs

    rustPlatform.cargoSetupHook

    (cargo-tauri.hook.override { cargo-tauri = cargo-tauri_2; })

    cargo-tauri.hook

    rustPlatform.cargoCheckHook

    pkg-config

    wrapGAppsHook3