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

kid3: qt5 support

Browse Source
This commit is contained in:
AndersonTorres 2018-05-01 15:20:15 -03:00
parent b9f669e5bc
commit f08de6c729
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 { stdenv, fetchurl
, pkgconfig, cmake , pkgconfig, cmake, python, ffmpeg, phonon, automoc4
, docbook_xml_dtd_45, docbook_xsl, libxslt , chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt
, python, ffmpeg, mp4v2, flac, libogg, libvorbis , id3lib, taglib, mp4v2, flac, libogg, libvorbis
, phonon, automoc4, chromaprint, id3lib, taglib , zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols
, qt, zlib, readline
, makeWrapper , makeWrapper
}: }:
@ -18,9 +17,10 @@ stdenv.mkDerivation rec {
}; };
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ pkgconfig cmake python ffmpeg docbook_xml_dtd_45 docbook_xsl libxslt [ pkgconfig cmake python ffmpeg phonon automoc4
phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis chromaprint docbook_xml_dtd_45 docbook_xsl libxslt
qt zlib readline makeWrapper ]; id3lib taglib mp4v2 flac libogg libvorbis zlib readline
qtbase qttools qtmultimedia qtquickcontrols makeWrapper ];
cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ]; cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ];
NIX_LDFLAGS = "-lm -lpthread"; NIX_LDFLAGS = "-lm -lpthread";
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
''; '';
postInstall = '' 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; enableParallelBuilding = true;
@ -73,4 +73,3 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; 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 { }; khard = callPackage ../applications/misc/khard { };
kid3 = callPackage ../applications/audio/kid3 { kid3 = libsForQt5.callPackage ../applications/audio/kid3 { };
qt = qt4;
};
kile = libsForQt5.callPackage ../applications/editors/kile { }; kile = libsForQt5.callPackage ../applications/editors/kile { };