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

Merge pull request #39827 from AndersonTorres/upload/kid3-qt5

Browse Source 
kid3: qt5 support
This commit is contained in:
xeji 2018-05-01 21:51:06 +02:00 committed by GitHub
commit 3abe395b54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/audio/kid3/default.nix
View File

@ -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!

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };