Merge pull request #266679 from reckenrode/libopenshot-fix

libopenshot: fix build on Darwin

authored by

Ben Siraphob and committed by
GitHub
cc0c0f9e d8ebb730

+7 -1
+4
pkgs/applications/video/openshot-qt/libopenshot.nix
··· 31 32 postPatch = '' 33 sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt 34 ''; 35 36 nativeBuildInputs = lib.optionals stdenv.isLinux [
··· 31 32 postPatch = '' 33 sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt 34 + '' + lib.optionalString stdenv.isDarwin '' 35 + # Darwin requires both Magick++ and MagickCore or it will fail to link. 36 + substituteInPlace src/CMakeLists.txt \ 37 + --replace 'target_link_libraries(openshot PUBLIC ImageMagick::Magick++)' 'target_link_libraries(openshot PUBLIC ImageMagick::Magick++ ImageMagick::MagickCore)' 38 ''; 39 40 nativeBuildInputs = lib.optionals stdenv.isLinux [
+3 -1
pkgs/top-level/qt5-packages.nix
··· 128 129 liblastfm = callPackage ../development/libraries/liblastfm { }; 130 131 - libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { }; 132 133 packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; 134
··· 128 129 liblastfm = callPackage ../development/libraries/liblastfm { }; 130 131 + libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { 132 + stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; 133 + }; 134 135 packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; 136