diff options
-rw-r--r-- | pkgs/development/libraries/phonon/backends/vlc.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 643e36ba6cd6c..0487886a89665 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -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"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50736caab8389..d4a437ebabe78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11192,7 +11192,10 @@ with pkgs; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; - phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {}; + # TODO(@Ma27) get rid of that as soon as QT4 can be dropped + phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { + withQt4 = true; + }; inherit (callPackage ../development/libraries/physfs { }) physfs_2 |