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

openshot-qt: enable on darwin

Browse Source
This commit is contained in:
Dmitry Kalinkin
2020-11-16 18:07:08 -05:00
parent fcd325c974
commit 972bcb496d
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/video/openshot-qt/default.nix
+9 -2
View File
@@ -1,6 +1,7 @@
{ stdenv, mkDerivationWith, fetchFromGitHub, fetchpatch { stdenv, mkDerivationWith, fetchFromGitHub, fetchpatch
, doxygen, python3Packages, libopenshot , doxygen, python3Packages, libopenshot
, wrapGAppsHook, gtk3 }: , wrapGAppsHook, gtk3
, qtsvg }:
mkDerivationWith python3Packages.buildPythonApplication rec { mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "openshot-qt"; pname = "openshot-qt";
@@ -29,6 +30,12 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
postFixup = '' postFixup = ''
wrapProgram $out/bin/openshot-qt \ 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[@]}" \ "''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}" "''${qtWrapperArgs[@]}"
''; '';
@@ -47,6 +54,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
''; '';
license = with licenses; gpl3Plus; license = with licenses; gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ]; maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; linux; platforms = with platforms; unix;
}; };
} }
pkgs/top-level/all-packages.nix
+9 -12
View File
@@ -9445,18 +9445,15 @@ in
graalvm8-ee graalvm8-ee
graalvm11-ee; graalvm11-ee;
openshot-qt = let # Cannot use a newer Qt (5.15) version because it requires qtwebkit
# Cannot use a newer Qt (5.15) version because it requires qtwebkit # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b
# and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b openshot-qt = (pkgs.extend (final: prev: rec {
pkgs_ = pkgs.extend(_: prev: { qt5 = if stdenv.isDarwin then prev.qt5 else prev.qt514;
pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { libsForQt5 = if stdenv.isDarwin then prev.libsForQt5 else prev.libsForQt514;
pkgs = oldAttrs.pkgs.extend(_: _: { pythonInterpreters = prev.pythonInterpreters.override {
qt5 = pkgs.qt514; pkgs = final;
libsForQt5 = pkgs.libsForQt514; };
}); })).libsForQt5.callPackage ../applications/video/openshot-qt { };
});
});
in pkgs_.libsForQt514.callPackage ../applications/video/openshot-qt { };
openspin = callPackage ../development/compilers/openspin { }; openspin = callPackage ../development/compilers/openspin { };