From a08b100ead167741c3b6b6ec2998afb3e057f7b6 Mon Sep 17 00:00:00 2001 From: PhiliPdB Date: Wed, 28 Jan 2026 18:55:08 +0100 Subject: [PATCH] rapidraw: general cleanup - Move ORT_STRATEGY into `env`. - ORT_DYLIB_PATH doesn't need to be set as it is not read. - There is no dylib in resources/, no need to remove. --- pkgs/by-name/ra/rapidraw/package.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ra/rapidraw/package.nix b/pkgs/by-name/ra/rapidraw/package.nix index 11ecd18ee01a..95e27c462fe1 100644 --- a/pkgs/by-name/ra/rapidraw/package.nix +++ b/pkgs/by-name/ra/rapidraw/package.nix @@ -132,8 +132,9 @@ rustPlatform.buildRustPackage (finalAttrs: { dontWrapGApps = true; - # needs to be declared twice annoyingly - ORT_STRATEGY = "system"; + env = { + ORT_STRATEGY = "system"; + }; postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' # Patch the .desktop file to set the Categories field @@ -144,16 +145,12 @@ rustPlatform.buildRustPackage (finalAttrs: { # link the .so file ln -sf ${onnxruntime}/lib/libonnxruntime.so $out/lib/RapidRAW/resources/libonnxruntime.so - - # remove the .dylib file - rm -rf $out/lib/RapidRAW/resources/libonnxruntime.dylib ''; postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapGApp $out/bin/rapidraw \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} \ - --set ORT_STRATEGY "system" \ - --set ORT_DYLIB_PATH "${onnxruntime}/lib/libonnxruntime.so" + --set ORT_STRATEGY "system" ''; meta = {