Merge pull request #42586 from Ma27/phonon-qt5-by-default

phonon-backend-vlc: use qt5 by default
This commit is contained in:
xeji
2018-06-26 18:26:14 +02:00
committed by GitHub
3 changed files with 13 additions and 8 deletions

View File

@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc
, extra-cmake-modules, qtbase ? null, qtx11extras ? null, qt4 ? null
, withQt5 ? false
, withQt4 ? false
, debug ? false
}:
@@ -11,11 +11,12 @@ let
pname = "phonon-backend-vlc";
in
assert withQt5 -> qtbase != null;
assert withQt5 -> qtx11extras != null;
assert withQt4 -> qt4 != null;
assert !withQt4 -> qtbase != null;
assert !withQt4 -> qtx11extras != null;
stdenv.mkDerivation rec {
name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}";
name = "${pname}-${if withQt4 then "qt4" else "qt5"}-${v}";
meta = with stdenv.lib; {
homepage = https://phonon.kde.org/;
@@ -30,11 +31,11 @@ stdenv.mkDerivation rec {
buildInputs =
[ phonon vlc ]
++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]);
++ (if withQt4 then [ qt4 ] else [ qtbase qtx11extras ]);
nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;
nativeBuildInputs = [ cmake pkgconfig ] ++ optional (!withQt4) extra-cmake-modules;
cmakeFlags =
[ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]
++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON";
++ optional (!withQt4) "-DPHONON_BUILD_PHONON4QT5=ON";
}