diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-01 21:51:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 21:51:06 +0200 |
| commit | 3abe395b5442ad2abfb72323ea8ab2ee4531c5c8 (patch) | |
| tree | d64f6789551cab0fd0dfeaf7922c7b507d4eff0c | |
| parent | f787dfc0de2ae7a5f29561f5c3f59d9cc066cfdc (diff) | |
| parent | f08de6c7294f35d0bd0f52ba3087307708578d23 (diff) | |
Merge pull request #39827 from AndersonTorres/upload/kid3-qt5
kid3: qt5 support
| -rw-r--r-- | pkgs/applications/audio/kid3/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 4c9540607eb6..31369bd1e638 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl -, pkgconfig, cmake -, docbook_xml_dtd_45, docbook_xsl, libxslt -, python, ffmpeg, mp4v2, flac, libogg, libvorbis -, phonon, automoc4, chromaprint, id3lib, taglib -, qt, zlib, readline +, pkgconfig, cmake, python, ffmpeg, phonon, automoc4 +, chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt +, id3lib, taglib, mp4v2, flac, libogg, libvorbis +, zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols , makeWrapper }: @@ -18,9 +17,10 @@ stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ pkgconfig cmake python ffmpeg docbook_xml_dtd_45 docbook_xsl libxslt - phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis - qt zlib readline makeWrapper ]; + [ pkgconfig cmake python ffmpeg phonon automoc4 + chromaprint docbook_xml_dtd_45 docbook_xsl libxslt + id3lib taglib mp4v2 flac libogg libvorbis zlib readline + qtbase qttools qtmultimedia qtquickcontrols makeWrapper ]; cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ]; NIX_LDFLAGS = "-lm -lpthread"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/kid3-qt --prefix QT_PLUGIN_PATH : $out/lib/qt4/plugins + wrapProgram $out/bin/kid3-qt --prefix QT_PLUGIN_PATH : $out/lib/qt5/plugins ''; enableParallelBuilding = true; @@ -73,4 +73,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } -# TODO: Qt5 support - not so urgent! diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24dd47dc63a1..ed160aed85ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16468,9 +16468,7 @@ with pkgs; khard = callPackage ../applications/misc/khard { }; - kid3 = callPackage ../applications/audio/kid3 { - qt = qt4; - }; + kid3 = libsForQt5.callPackage ../applications/audio/kid3 { }; kile = libsForQt5.callPackage ../applications/editors/kile { }; |