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

cantata: drop qt4 option

Browse Source
This commit is contained in:
Peter Hoeg 2018-01-01 18:54:47 +08:00
parent 9a8c1b24bc
commit 8b2d22041f
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/audio/cantata/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc { stdenv, fetchFromGitHub, cmake, pkgconfig, vlc
, withQt4 ? false, qt4 , qtbase, qtmultimedia, qtsvg, qttools
, withQt5 ? true, qtbase, qtmultimedia, qtsvg, qttools
# Cantata doesn't build with cdparanoia enabled so we disable that # Cantata doesn't build with cdparanoia enabled so we disable that
# default for now until I (or someone else) figure it out. # default for now until I (or someone else) figure it out.
@ -19,11 +18,6 @@
, withStreams ? true , withStreams ? true
}: }:
# One and only one front-end.
assert withQt5 -> withQt4 == false;
assert withQt4 -> withQt5 == false;
assert withQt4 || withQt5;
# Inter-dependencies. # Inter-dependencies.
assert withCddb -> withCdda && withTaglib; assert withCddb -> withCdda && withTaglib;
assert withCdda -> withCddb && withMusicbrainz; assert withCdda -> withCddb && withMusicbrainz;
@ -51,9 +45,7 @@ in stdenv.mkDerivation rec {
sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6"; sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6";
}; };
buildInputs = [ vlc ] buildInputs = [ vlc qtbase qtmultimedia qtsvg ]
++ stdenv.lib.optional withQt4 qt4
++ stdenv.lib.optionals withQt5 [ qtbase qtmultimedia qtsvg qttools ]
++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
++ stdenv.lib.optional withCdda cdparanoia ++ stdenv.lib.optional withCdda cdparanoia
@ -63,12 +55,11 @@ in stdenv.mkDerivation rec {
++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
++ stdenv.lib.optional withUdisks udisks2; ++ stdenv.lib.optional withUdisks udisks2;
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig qttools ];
enableParallelBuilding = true; enableParallelBuilding = true;
cmakeFlags = stdenv.lib.flatten [ cmakeFlags = stdenv.lib.flatten [
(fstat withQt5 "QT5")
(fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
(fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ])
(fstat withCdda "CDPARANOIA") (fstat withCdda "CDPARANOIA")