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.
This commit is contained in:
parent
532f202b64
commit
e563774fac
1 changed files with 4 additions and 3 deletions
|
@ -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/";
|
||||
|
|
Loading…
Reference in a new issue