Merge pull request #103339 from veprbl/pr/openshot_darwin

openshot-qt: enable on darwin
This commit is contained in:
Anderson Torres
2020-11-16 22:45:14 -03:00
committed by GitHub
4 changed files with 39 additions and 21 deletions
@@ -1,6 +1,7 @@
{ stdenv, mkDerivationWith, fetchFromGitHub, fetchpatch
, doxygen, python3Packages, libopenshot
, wrapGAppsHook, gtk3 }:
, wrapGAppsHook, gtk3
, qtsvg }:
mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "openshot-qt";
@@ -29,6 +30,12 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
postFixup = ''
wrapProgram $out/bin/openshot-qt \
''
# Fix toolbar icons on Darwin
+ stdenv.lib.optionalString stdenv.isDarwin ''
--suffix QT_PLUGIN_PATH : "${stdenv.lib.getBin qtsvg}/lib/qt-5.12.7/plugins" \
''
+ ''
"''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}"
'';
@@ -47,6 +54,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
'';
license = with licenses; gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; linux;
platforms = with platforms; unix;
};
}
@@ -1,4 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen, alsaLib , libX11, libXft, libXrandr, libXinerama, libXext, libXcursor }:
{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen
, alsaLib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor
, zlib, AGL, Cocoa, Foundation
}:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -16,7 +19,12 @@ stdenv.mkDerivation rec {
[ pkgconfig cmake doxygen ];
buildInputs =
[ alsaLib libX11 libXft libXrandr libXinerama libXext libXcursor ];
optionals stdenv.isLinux [ alsaLib ]
++ (if stdenv.isDarwin then
[ zlib AGL Cocoa Foundation ]
else
[ libX11 libXft libXrandr libXinerama libXext libXcursor ])
;
doCheck = false;
@@ -30,6 +38,6 @@ stdenv.mkDerivation rec {
'';
license = with licenses; gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; linux;
platforms = with platforms; unix;
};
}
@@ -3,7 +3,9 @@
, libopenshot-audio, imagemagick, ffmpeg_3
, swig, python3
, unittest-cpp, cppzmq, zeromq
, qtbase, qtmultimedia }:
, qtbase, qtmultimedia
, llvmPackages
}:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -27,7 +29,9 @@ stdenv.mkDerivation rec {
buildInputs =
[ imagemagick ffmpeg_3 swig python3 unittest-cpp
cppzmq zeromq qtbase qtmultimedia ];
cppzmq zeromq qtbase qtmultimedia ]
++ optional stdenv.isDarwin llvmPackages.openmp
;
LIBOPENSHOT_AUDIO_DIR = libopenshot-audio;
"UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++";
@@ -46,6 +50,6 @@ stdenv.mkDerivation rec {
'';
license = with licenses; gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; linux;
platforms = with platforms; unix;
};
}