Merge pull request #89345 from josephtheengineer/olive-editor-wrap-qt

olive-editor: use wrapQtAppsHook
This commit is contained in:
Benjamin Hipple 2020-06-03 22:36:09 -04:00 committed by GitHub
commit 1ae28ebfdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, which, qmake, mkDerivation, { stdenv, fetchFromGitHub, pkgconfig, which, qmake, mkDerivation,
qtbase, qtmultimedia, frei0r, opencolorio, ffmpeg-full, qtmultimedia, wrapQtAppsHook, frei0r, opencolorio, ffmpeg-full,
CoreFoundation }: CoreFoundation }:
mkDerivation rec { mkDerivation rec {
pname = "olive-editor"; pname = "olive-editor";
@ -17,15 +17,14 @@ mkDerivation rec {
pkgconfig pkgconfig
which which
qmake qmake
wrapQtAppsHook
]; ];
buildInputs = [ buildInputs = [
ffmpeg-full ffmpeg-full
frei0r frei0r
opencolorio opencolorio
qtbase
qtmultimedia qtmultimedia
qtmultimedia.dev
] ++ stdenv.lib.optional stdenv.isDarwin CoreFoundation; ] ++ stdenv.lib.optional stdenv.isDarwin CoreFoundation;
meta = with stdenv.lib; { meta = with stdenv.lib; {