diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-11-10 15:08:26 -0500 |
---|---|---|
committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-11-16 18:07:08 -0500 |
commit | 972bcb496d13063543c2d38415d22da58bbd44c3 (patch) | |
tree | b422e3e39ad76bb58e5ab0a662ca83ce7040fae0 | |
parent | fcd325c97482e56157e3daf4be21d7d08d69669a (diff) |
openshot-qt: enable on darwin
-rw-r--r-- | pkgs/applications/video/openshot-qt/default.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 21 |
2 files changed, 18 insertions, 14 deletions
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index cd3176249f8a..ede47ad061f6 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea41ea9810af..75d7b2863fad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9445,18 +9445,15 @@ in graalvm8-ee graalvm11-ee; - openshot-qt = let - # Cannot use a newer Qt (5.15) version because it requires qtwebkit - # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b - pkgs_ = pkgs.extend(_: prev: { - pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { - pkgs = oldAttrs.pkgs.extend(_: _: { - qt5 = pkgs.qt514; - libsForQt5 = pkgs.libsForQt514; - }); - }); - }); - in pkgs_.libsForQt514.callPackage ../applications/video/openshot-qt { }; + # Cannot use a newer Qt (5.15) version because it requires qtwebkit + # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b + openshot-qt = (pkgs.extend (final: prev: rec { + qt5 = if stdenv.isDarwin then prev.qt5 else prev.qt514; + libsForQt5 = if stdenv.isDarwin then prev.libsForQt5 else prev.libsForQt514; + pythonInterpreters = prev.pythonInterpreters.override { + pkgs = final; + }; + })).libsForQt5.callPackage ../applications/video/openshot-qt { }; openspin = callPackage ../development/compilers/openspin { }; |