From 80d4ee361542f9a3e6a3b7b996e81329c6350446 Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 29 Jun 2023 21:47:43 +0800 Subject: pot: remove the workground for different branch of the same git dep --- pkgs/applications/misc/pot/Cargo.lock | 2 +- pkgs/applications/misc/pot/default.nix | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'pkgs/applications/misc/pot') diff --git a/pkgs/applications/misc/pot/Cargo.lock b/pkgs/applications/misc/pot/Cargo.lock index be864c40e44f7..7772f9927ede5 100644 --- a/pkgs/applications/misc/pot/Cargo.lock +++ b/pkgs/applications/misc/pot/Cargo.lock @@ -3802,7 +3802,7 @@ dependencies = [ [[package]] name = "tauri-plugin-single-instance" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#c4d2c8c693a8e0da627f4c845486dbe1b1e32c64" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#dce0f02bc571128308c30278cde3233f341e6a50" dependencies = [ "log", "serde", diff --git a/pkgs/applications/misc/pot/default.nix b/pkgs/applications/misc/pot/default.nix index e029d365bfa99..cad203519f70d 100644 --- a/pkgs/applications/misc/pot/default.nix +++ b/pkgs/applications/misc/pot/default.nix @@ -34,11 +34,6 @@ stdenv.mkDerivation rec { sourceRoot = "source/src-tauri"; - postUnpack = '' - sed -i -e 's/dev/v1/' source/src-tauri/Cargo.toml - cp ${./Cargo.lock} source/src-tauri/Cargo.lock - ''; - postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" @@ -81,7 +76,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "tauri-plugin-single-instance-0.0.0" = "sha256-9eclolp+Gb8qF/KYIRiOoCJbMJLI8LyWLQu82npI7mQ="; + "tauri-plugin-single-instance-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U="; "tauri-plugin-autostart-0.0.0" = "sha256-9eclolp+Gb8qF/KYIRiOoCJbMJLI8LyWLQu82npI7mQ="; "enigo-0.1.2" = "sha256-99VJ0WYD8jV6CYUZ1bpYJBwIE2iwOZ9SjOvyA2On12Q="; "selection-0.1.0" = "sha256-85NUACRi7TjyMNKVz93G+W1EXKIVZZge/h/HtDwiW/Q="; -- cgit 1.4.1