From b43794a7fe7b0bf6d435166bd05d7795f936ca7e Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 18 Jun 2025 18:42:51 +0200 Subject: [PATCH] dorion: don't assume build layout --- pkgs/by-name/do/dorion/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index a7b804dfe9bf..5a32f4e52376 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -104,9 +104,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -rf updater # patch cargo-deps - pushd $cargoDepsCopy/tauri-plugin-shell-* - patch -p1 < /build/source/src-tauri/patches/tauri-plugin-shell+*.patch - popd + patch -d $cargoDepsCopy/tauri-plugin-shell-* -p1 < ./src-tauri/patches/tauri-plugin-shell+*.patch substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" @@ -120,7 +118,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ln -s ${shelter} src-tauri/injection/shelter.js # link html/frontend data - ln -s /build/source/src /build/source/src-tauri/html + ln -s $(pwd)/src src-tauri/html ''; configurePhase = '' @@ -130,7 +128,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildPhase = '' ninjaBuildPhase - cd /build/source + cd ../.. tauriBuildHook '';