diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-07-29 10:29:41 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-07-29 10:29:41 -0500 |
| commit | 2f32588a8fbd598bc5606857e055f94d388d3113 (patch) | |
| tree | a014228ef27179f663ae9ec385bcd618c3ec496f /pkgs | |
| parent | 3dea00d90ef000a41652a6b629c76fffce3727c7 (diff) | |
| download | nixlib-2f32588a8fbd598bc5606857e055f94d388d3113.tar nixlib-2f32588a8fbd598bc5606857e055f94d388d3113.tar.gz nixlib-2f32588a8fbd598bc5606857e055f94d388d3113.tar.bz2 nixlib-2f32588a8fbd598bc5606857e055f94d388d3113.tar.lz nixlib-2f32588a8fbd598bc5606857e055f94d388d3113.tar.xz nixlib-2f32588a8fbd598bc5606857e055f94d388d3113.tar.zst nixlib-2f32588a8fbd598bc5606857e055f94d388d3113.zip | |
phonon: explicitly select Qt 4 vs. Qt 5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/phonon/backends/gstreamer.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/phonon/backends/vlc.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/phonon/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
4 files changed, 19 insertions, 11 deletions
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 3f2ab6696d18..1fb542c2c5f4 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -1,13 +1,14 @@ { stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkgconfig -, extra-cmake-modules ? null, qtbase ? null, qtx11extras ? null, qt4 ? null -, debug ? false }: +, extra-cmake-modules, qtbase ? null, qtx11extras ? null, qt4 ? null +, withQt5 ? false +, debug ? false +}: with lib; let v = "4.9.0"; pname = "phonon-backend-gstreamer"; - withQt5 = extra-cmake-modules != null; in assert withQt5 -> qtbase != null; diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index aaff26eee286..f296e34e783a 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -1,13 +1,14 @@ { stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc -, extra-cmake-modules ? null, qtbase ? null, qtx11extras ? null, qt4 ? null -, debug ? false }: +, extra-cmake-modules, qtbase ? null, qtx11extras ? null, qt4 ? null +, withQt5 ? false +, debug ? false +}: with lib; let v = "0.9.0"; pname = "phonon-backend-vlc"; - withQt5 = extra-cmake-modules != null; in assert withQt5 -> qtbase != null; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 3fbbccc08e30..4bbe05fea6ee 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio -, qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qttools ? null +, qt4 ? null, extra-cmake-modules, qtbase ? null, qttools ? null +, withQt5 ? false , debug ? false }: with lib; let v = "4.9.0"; - withQt5 = extra-cmake-modules != null; in assert withQt5 -> qtbase != null; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fae5fe25f5ef..e6c50d195c5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9142,11 +9142,17 @@ in openbr = callPackage ../development/libraries/openbr { }; - phonon = callPackage ../development/libraries/phonon { }; + phonon = callPackage ../development/libraries/phonon { + withQt5 = true; + }; - phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { }; + phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { + withQt5 = true; + }; - phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; + phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { + withQt5 = true; + }; polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; |