From 4f2e7a0424a51f7462f219fa5691be1d3ae6a082 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 25 Feb 2017 09:44:01 -0600 Subject: Separate Qt 5 packages from dependent libraries --- pkgs/development/libraries/phonon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/phonon') diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 4bbe05fea6ee2..31d8b7d7c8e06 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio -, qt4 ? null, extra-cmake-modules, qtbase ? null, qttools ? null +, qt4 ? null, ecm ? null, qtbase ? null, qttools ? null , withQt5 ? false , debug ? false }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { [ mesa libpulseaudio ] ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]); - nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; + nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 ecm; NIX_CFLAGS_COMPILE = "-fPIC"; -- cgit 1.4.1