JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phonon: explicitly select Qt 4 vs. Qt 5

Browse Source
This commit is contained in:
Thomas Tuegel 2016-07-29 10:29:41 -05:00
parent 3dea00d90e
commit 2f32588a8f
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/phonon/backends/gstreamer.nix
View File

@ -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;

7
pkgs/development/libraries/phonon/backends/vlc.nix
View File

@ -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;

4
pkgs/development/libraries/phonon/default.nix
View File

@ -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;

12
pkgs/top-level/all-packages.nix
View File

@ -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 { };