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

phonon: remove qtquick1 input

Browse Source
This commit is contained in:
Thomas Tuegel 2016-05-10 20:09:15 -05:00
parent 6011898cb5
commit 05bbe4fa55
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio { stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio
, qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qtquick1 ? null, qttools ? null , qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qttools ? null
, debug ? false }: , debug ? false }:
with lib; with lib;
@ -10,7 +10,6 @@ let
in in
assert withQt5 -> qtbase != null; assert withQt5 -> qtbase != null;
assert withQt5 -> qtquick1 != null;
assert withQt5 -> qttools != null; assert withQt5 -> qttools != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ mesa libpulseaudio ] [ mesa libpulseaudio ]
++ (if withQt5 then [ qtbase qtquick1 qttools ] else [ qt4 ]); ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]);
nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;