From e563774fac3af13b5bef77804dcc29147e9b5e4a Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sun, 12 Feb 2023 13:53:33 -0600 Subject: [PATCH] libopenshot: improve Python dir specification to fix Darwin Previously, the Python path selection logic was patched in the CMake files. This patch no longer applies. Fortunately there is a new way to directly specify the path without patches. Use that instead on all platforms to fix the CMake logic being broken on Darwin which results in this module not being detected and the main application failing to start. --- pkgs/applications/video/openshot-qt/libopenshot.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 4214bed7167f..904f039758ca 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt - sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' bindings/python/CMakeLists.txt - export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) ''; nativeBuildInputs = lib.optionals stdenv.isLinux [ @@ -62,7 +60,10 @@ stdenv.mkDerivation rec { doCheck = false; - cmakeFlags = [ "-DENABLE_RUBY=OFF" ]; + cmakeFlags = [ + "-DENABLE_RUBY=OFF" + "-DPYTHON_MODULE_PATH=${python3.sitePackages}" + ]; meta = with lib; { homepage = "http://openshot.org/";