diff options
author | Peter Hoeg <peter@hoeg.com> | 2018-01-01 18:54:47 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2018-01-01 23:12:51 +0800 |
commit | 8b2d22041fa5df10126706c777a07367c00bbb42 (patch) | |
tree | 980a0a2d0649e03e01cdbafaaab25e3d1fb608b9 /pkgs/applications/audio/cantata/default.nix | |
parent | 9a8c1b24bc6d66f3ee6c28c83fdc6197e2e294f6 (diff) | |
download | nixpkgs-8b2d22041fa5df10126706c777a07367c00bbb42.tar nixpkgs-8b2d22041fa5df10126706c777a07367c00bbb42.tar.gz nixpkgs-8b2d22041fa5df10126706c777a07367c00bbb42.tar.bz2 nixpkgs-8b2d22041fa5df10126706c777a07367c00bbb42.tar.lz nixpkgs-8b2d22041fa5df10126706c777a07367c00bbb42.tar.xz nixpkgs-8b2d22041fa5df10126706c777a07367c00bbb42.tar.zst nixpkgs-8b2d22041fa5df10126706c777a07367c00bbb42.zip |
cantata: drop qt4 option
Diffstat (limited to 'pkgs/applications/audio/cantata/default.nix')
-rw-r--r-- | pkgs/applications/audio/cantata/default.nix | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 35fe510cbb2..57d8b554c4f 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, vlc -, withQt4 ? false, qt4 -, withQt5 ? true, qtbase, qtmultimedia, qtsvg, qttools +, qtbase, qtmultimedia, qtsvg, qttools # Cantata doesn't build with cdparanoia enabled so we disable that # default for now until I (or someone else) figure it out. @@ -19,11 +18,6 @@ , withStreams ? true }: -# One and only one front-end. -assert withQt5 -> withQt4 == false; -assert withQt4 -> withQt5 == false; -assert withQt4 || withQt5; - # Inter-dependencies. assert withCddb -> withCdda && withTaglib; assert withCdda -> withCddb && withMusicbrainz; @@ -51,9 +45,7 @@ in stdenv.mkDerivation rec { sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6"; }; - buildInputs = [ vlc ] - ++ stdenv.lib.optional withQt4 qt4 - ++ stdenv.lib.optionals withQt5 [ qtbase qtmultimedia qtsvg qttools ] + buildInputs = [ vlc qtbase qtmultimedia qtsvg ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] ++ stdenv.lib.optional withCdda cdparanoia @@ -63,12 +55,11 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 ++ stdenv.lib.optional withUdisks udisks2; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig qttools ]; enableParallelBuilding = true; cmakeFlags = stdenv.lib.flatten [ - (fstat withQt5 "QT5") (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) (fstat withCdda "CDPARANOIA") |