From 2f32588a8fbd598bc5606857e055f94d388d3113 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jul 2016 10:29:41 -0500
Subject: phonon: explicitly select Qt 4 vs. Qt 5

---
 pkgs/development/libraries/phonon/backends/gstreamer.nix | 7 ++++---
 pkgs/development/libraries/phonon/backends/vlc.nix       | 7 ++++---
 pkgs/development/libraries/phonon/default.nix            | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'pkgs/development/libraries/phonon')

diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index 3f2ab6696d18b..1fb542c2c5f4d 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 aaff26eee2867..f296e34e783ae 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 3fbbccc08e30a..4bbe05fea6ee2 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;
-- 
cgit 1.4.1