qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: adopt new cargo-tauri versions

Browse Source
This commit is contained in:
seth 2024-10-03 19:38:37 -04:00
parent a6e5c11cc4
commit 9ae02ff8a8
No known key found for this signature in database
GPG Key ID: D31BD0D494BBEE86
13 changed files with 24 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/by-name/al/alcom/package.nix
View File

@ -1,7 +1,7 @@
{
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

4
pkgs/by-name/al/alexandria/package.nix
View File

@ -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

4
pkgs/by-name/ci/cinny-desktop/package.nix
View File

@ -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
];

4
pkgs/by-name/en/en-croissant/package.nix
View File

@ -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 ]

23
pkgs/by-name/ga/gale/package.nix
View File

@ -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

4
pkgs/by-name/gi/gitbutler/package.nix
View File

@ -6,7 +6,7 @@
fetchFromGitHub,
pnpm_9,
wrapGAppsHook3,
cargo-tauri,
cargo-tauri_1,
darwin,
desktop-file-utils,
esbuild,
@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec {
};
nativeBuildInputs = [
cargo-tauri.hook
cargo-tauri_1.hook
desktop-file-utils
jq
moreutils

4
pkgs/by-name/in/insulator2/package.nix
View File

@ -14,7 +14,7 @@
, stdenv
, yarnConfigHook
, nodejs-slim
, cargo-tauri
, cargo-tauri_1
, cargo
, rustPlatform
, rustc
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
rustPlatform.cargoSetupHook
cargo
rustc
cargo-tauri.hook
cargo-tauri_1.hook
yarnConfigHook
nodejs-slim
cyrus_sasl

4
pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
View File

@ -4,7 +4,7 @@
fetchFromGitHub,
rustPlatform,
cacert,
cargo-tauri,
cargo-tauri_1,
darwin,
desktop-file-utils,
libsoup,
@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
cacert # required for turbo
cargo-tauri.hook
cargo-tauri_1.hook
desktop-file-utils
nodejs
pkg-config

4
pkgs/by-name/mo/mouse-actions-gui/package.nix
View File

@ -10,7 +10,7 @@
rustPlatform,
cargo,
rustc,
cargo-tauri,
cargo-tauri_1,
pkg-config,
wrapGAppsHook3,
@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
rustPlatform.cargoSetupHook
cargo
rustc
cargo-tauri.hook
cargo-tauri_1.hook
pkg-config
wrapGAppsHook3
];

4
pkgs/by-name/po/pot/package.nix
View File

@ -8,7 +8,7 @@
wrapGAppsHook3,
cargo,
rustc,
cargo-tauri,
cargo-tauri_1,
pkg-config,
esbuild,
buildGoModule,
@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
rustPlatform.cargoSetupHook
cargo
rustc
cargo-tauri.hook
cargo-tauri_1.hook
nodejs
pnpm.configHook
wrapGAppsHook3

19
pkgs/by-name/su/surrealist/package.nix
View File

@ -22,23 +22,6 @@
}:
let
cargo-tauri_2 = let
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 (drv: {
inherit src version;
cargoDeps = drv.cargoDeps.overrideAttrs (lib.const {
inherit src;
name = "tauri-${version}-vendor.tar.gz";
outputHash = "sha256-BrIH0JkGMp68O+4B+0g7X3lSdNSPXo+otlBgslCzPZE=";
});
});
esbuild_21-5 = let
version = "0.21.5";
in esbuild.override {
@ -90,7 +73,7 @@ in stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cargo
(cargo-tauri.hook.override { cargo-tauri = cargo-tauri_2; })
cargo-tauri.hook
gobject-introspection
makeBinaryWrapper
nodejs

4
pkgs/by-name/tr/treedome/package.nix
View File

@ -1,5 +1,5 @@
{ lib
, cargo-tauri
, cargo-tauri_1
, cmake
, dbus
, fetchgit
@ -87,7 +87,7 @@ rustPlatform.buildRustPackage {
nativeBuildInputs = [
cmake
pkg-config
cargo-tauri
cargo-tauri_1
wrapGAppsHook3
];

4
pkgs/by-name/we/wealthfolio/package.nix
View File

@ -2,7 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
cargo-tauri,
cargo-tauri_1,
libsoup,
nodejs,
openssl,
@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
cargo-tauri.hook
cargo-tauri_1.hook
nodejs
pkg-config
pnpm.configHook