diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-26 18:26:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 18:26:14 +0200 |
| commit | 6c0427e8ec94b23243c71f60cd4b92af470c0697 (patch) | |
| tree | ae40cdbe0cec80bbc582922afee8e093bf473ae8 | |
| parent | a627399a84f06251fc88030bde1b571f82121993 (diff) | |
| parent | d8560227926cea4d41e4360fd54b819025810eb9 (diff) | |
| download | nixpkgs-6c0427e8ec94b23243c71f60cd4b92af470c0697.tar nixpkgs-6c0427e8ec94b23243c71f60cd4b92af470c0697.tar.gz nixpkgs-6c0427e8ec94b23243c71f60cd4b92af470c0697.tar.bz2 nixpkgs-6c0427e8ec94b23243c71f60cd4b92af470c0697.tar.lz nixpkgs-6c0427e8ec94b23243c71f60cd4b92af470c0697.tar.xz nixpkgs-6c0427e8ec94b23243c71f60cd4b92af470c0697.tar.zst nixpkgs-6c0427e8ec94b23243c71f60cd4b92af470c0697.zip | |
Merge pull request #42586 from Ma27/phonon-qt5-by-default
phonon-backend-vlc: use qt5 by default
| -rw-r--r-- | pkgs/applications/audio/tomahawk/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/phonon/backends/vlc.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 4140c5da5a4..78bd4338353 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { homepage = http://tomahawk-player.org/; license = licenses.gpl3Plus; platforms = platforms.all; + broken = true; # 2018-06-25 }; } diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 643e36ba6cd..0487886a896 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 53695108166..85fa455d56d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11196,7 +11196,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 |