diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-17 14:26:11 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:44:42 -0500 |
commit | c816bbc8a86c7ea6c09ca42e1694fe08003a55fc (patch) | |
tree | 036a3c0d8a3a6a4be068cf153a863fc0114ef28f /pkgs/applications/video/bomi | |
parent | 1607f51613fc63a6fbfc1884c55a9efea06161b3 (diff) | |
download | nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.gz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.bz2 nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.lz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.xz nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.zst nixlib-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.zip |
qt5: remove makeQtWrapper
Diffstat (limited to 'pkgs/applications/video/bomi')
-rw-r--r-- | pkgs/applications/video/bomi/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 0995052cfc1e..bffb038f6536 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which, makeQtWrapper +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which , libX11, libxcb, mesa -, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake +, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper , libchardet , ffmpeg @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapQtProgram $out/bin/bomi \ + wrapProgram $out/bin/bomi \ ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ''; @@ -104,9 +104,7 @@ stdenv.mkDerivation rec { ++ optional cddaSupport "--enable-cdda" ; - nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper qmake ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ makeWrapper pkgconfig perl python which qttools qmake ]; meta = with stdenv.lib; { description = "Powerful and easy-to-use multimedia player"; |