gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libopenshot: improve Python dir specification to fix Darwin

Browse Source 
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:
Thomas Watson
2023-02-12 13:53:33 -06:00
committed by Florian Brandes
parent fd196e8d41
commit ae7c47a9d3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/video/openshot-qt/libopenshot.nix
View File

@@ -31,8 +31,6 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt 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 [ nativeBuildInputs = lib.optionals stdenv.isLinux [
@@ -62,7 +60,10 @@ stdenv.mkDerivation rec {
doCheck = false; doCheck = false;
cmakeFlags = [ "-DENABLE_RUBY=OFF" ]; cmakeFlags = [
"-DENABLE_RUBY=OFF"
"-DPYTHON_MODULE_PATH=${python3.sitePackages}"
];
meta = with lib; { meta = with lib; {
homepage = "http://openshot.org/"; homepage = "http://openshot.org/";