yaak: 2025.1.2 -> 2025.6.1
This commit is contained in:
@@ -20,25 +20,28 @@
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
stdenv,
|
||||
lld,
|
||||
wasm-pack,
|
||||
wasm-bindgen-cli_0_2_100,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "yaak";
|
||||
version = "2025.1.2";
|
||||
version = "2025.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mountain-loop";
|
||||
repo = "yaak";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-gD6gp7Qtf162zpRY0b3+g98GSH2aY07s2Auv4+lmbXQ=";
|
||||
hash = "sha256-3sEq7VpzaIMbkvHQTQLf3NRbAJjtpOJpirdcA7y2FIE=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-4D7ETUOLixpFB4luqQlwkGR/C6Ke6+ZmPg3dKKkrw7c=";
|
||||
hash = "sha256-zz9wlJ3yQ3oTyCFrAV7vD1xENLW+vmf2Pzly4yYas/g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YxOSfSyn+gUsw0HeKrkXZg568X9CAY1UWKnGHHWCC78=";
|
||||
cargoHash = "sha256-CMx7vTSGeQMXpXeH4LIOKEb29CfKXQV+r8tSYdmW5U4=";
|
||||
|
||||
cargoRoot = "src-tauri";
|
||||
|
||||
@@ -51,6 +54,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
protobuf
|
||||
perl
|
||||
makeWrapper
|
||||
lld
|
||||
wasm-pack
|
||||
wasm-bindgen-cli_0_2_100
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -66,11 +72,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
# This must be set so that `npm rebuild` doesn't download wasm-pack
|
||||
env.NPM_CONFIG_IGNORE_SCRIPTS = "true";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src-tauri/tauri.conf.json \
|
||||
--replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false' \
|
||||
--replace-fail '"0.0.0"' '"${finalAttrs.version}"'
|
||||
substituteInPlace src-tauri/tauri.commercial.conf.json \
|
||||
--replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false' \
|
||||
--replace-fail '"https://update.yaak.app/check/{{target}}/{{arch}}/{{current_version}}"' '"https://non.existent.domain"'
|
||||
substituteInPlace package.json \
|
||||
--replace-fail '"bootstrap:vendor-node": "node scripts/vendor-node.cjs",' "" \
|
||||
--replace-fail '"bootstrap:vendor-protoc": "node scripts/vendor-protoc.cjs",' ""
|
||||
@@ -95,6 +105,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
ln -s ${protobuf}/include src-tauri/vendored/protoc/include
|
||||
'';
|
||||
|
||||
tauriBuildFlags = [
|
||||
"--config"
|
||||
"./src-tauri/tauri.commercial.conf.json"
|
||||
];
|
||||
|
||||
# Permission denied (os error 13)
|
||||
# write to src-tauri/vendored/protoc/include
|
||||
doCheck = false;
|
||||
|
||||
Reference in New Issue
Block a user