diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index ba4165631e52..3cdd7fc7ad21 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -17,6 +17,7 @@ openssl, xxhash, pugixml, + onnxruntime, }: stdenv.mkDerivation (finalAttrs: { @@ -50,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { openssl xxhash pugixml + onnxruntime ]; postPatch = '' @@ -59,8 +61,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/bin/ffmpeg" "${lib.getExe ffmpeg}" substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/Wt/resources" "${wt}/share/Wt/resources" - substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms/docroot" "$out/share/lms/docroot" - substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms/approot" "$out/share/lms/approot" + substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms" "$out/share/lms" substituteInPlace $out/share/lms/default.service --replace-fail "/usr/bin/lms" "$out/bin/lms" install -Dm444 $out/share/lms/default.service -T $out/lib/systemd/system/lmsd.service ''; diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index a1beebf52eed..a12fa1fc08e0 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -61,6 +61,12 @@ let dontWrapQtApps = true; cmakeFlags = [ + "-DCMAKE_INSTALL_RPATH=${ + lib.makeLibraryPath [ + libice + libsm + ] + }" "-DWT_CPP_11_MODE=-std=c++11" "--no-warn-unused-cli" ]