diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-24 17:14:06 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-24 17:14:06 -0600 |
| commit | ea6355f2c5054543b7eb9d6981101579f3ac60f9 (patch) | |
| tree | d55182be8e911dbfd9c9b332641075392756e021 /pkgs/applications/audio/cantata | |
| parent | 0f5dbc3854974c8a89b1f6f86d357781e5d99bca (diff) | |
| download | nixpkgs-ea6355f2c5054543b7eb9d6981101579f3ac60f9.tar nixpkgs-ea6355f2c5054543b7eb9d6981101579f3ac60f9.tar.gz nixpkgs-ea6355f2c5054543b7eb9d6981101579f3ac60f9.tar.bz2 nixpkgs-ea6355f2c5054543b7eb9d6981101579f3ac60f9.tar.lz nixpkgs-ea6355f2c5054543b7eb9d6981101579f3ac60f9.tar.xz nixpkgs-ea6355f2c5054543b7eb9d6981101579f3ac60f9.tar.zst nixpkgs-ea6355f2c5054543b7eb9d6981101579f3ac60f9.zip | |
cantata: Remove KDE 4 support
It was permanently disabled anyway.
Diffstat (limited to 'pkgs/applications/audio/cantata')
| -rw-r--r-- | pkgs/applications/audio/cantata/default.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index f4e1fe8b151..89aadf49fb8 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -2,10 +2,6 @@ , withQt4 ? false, qt4 , withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper -# I'm unable to make KDE work here, crashes at runtime so I simply -# make Qt4 the default until someone who wants KDE can figure it out. -, withKDE4 ? false, kde4 - # Cantata doesn't build with cdparanoia enabled so we disable that # default for now until I (or someone else) figure it out. , withCdda ? false, cdparanoia @@ -24,10 +20,9 @@ }: # One and only one front-end. -assert withQt5 -> withQt4 == false && withKDE4 == false; -assert withQt4 -> withQt5 == false && withKDE4 == false; -assert withKDE4 -> withQt4 == false && withQt5 == false; -assert withQt4 || withQt5 || withKDE4; +assert withQt5 -> withQt4 == false; +assert withQt4 -> withQt5 == false; +assert withQt4 || withQt5; # Inter-dependencies. assert withCddb -> withCdda && withTaglib; @@ -58,7 +53,6 @@ stdenv.mkDerivation rec { [ cmake ] ++ stdenv.lib.optional withQt4 qt4 ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ] - ++ stdenv.lib.optional withKDE4 kde4.kdelibs ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] ++ stdenv.lib.optional withCdda cdparanoia @@ -66,16 +60,14 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional withLame lame ++ stdenv.lib.optional withMtp libmtp ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 - ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2; + ++ stdenv.lib.optional (withTaglib && withDevices) udisks2; nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper; unpackPhase = "tar -xvf $src"; sourceRoot = "${name}"; - # Qt4 is implicit when KDE is switched off. cmakeFlags = stdenv.lib.flatten [ - (fstats withKDE4 [ "KDE" "KWALLET" ]) (fstat withQt5 "QT5") (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) |