From 6043d53110a68329c1c9f279449b172ba0adcb3d Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 26 Sep 2024 21:12:34 -0400 Subject: [PATCH] mouse-actions-gui: use cargo-tauri.hook --- pkgs/by-name/mo/mouse-actions-gui/package.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix index 80f845038582d03..01478b8015b190b 100644 --- a/pkgs/by-name/mo/mouse-actions-gui/package.nix +++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { rustPlatform.cargoSetupHook cargo rustc - cargo-tauri + cargo-tauri.hook pkg-config wrapGAppsHook3 ]; @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { }; cargoRoot = "src-tauri"; + buildAndTestSubdir = finalAttrs.cargoRoot; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname version src; @@ -69,19 +70,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-H8TMpYFJWp227jPA5H2ZhSqTMiT/U6pT6eLyjibuoLU="; }; - buildPhase = '' - runHook preBuild - cargo-tauri build -b deb - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - + postInstall = '' install -Dm644 ${./80-mouse-actions.rules} $out/etc/udev/rules.d/80-mouse-actions.rules - cp -r src-tauri/target/release/bundle/deb/*/data/usr/* $out - - runHook postInstall ''; meta = {