From b4e28007daed114eb673533a16e2baf883bff79e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 11 May 2016 13:14:55 -0500 Subject: calamares: remove qtquick1 input Qt Quick was removed from Qt 5.6. --- pkgs/tools/misc/calamares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/misc/calamares/default.nix') diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index f9f9f06eb518..596030216f60 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, cmake, polkit-qt, libyamlcpp, python, boost, parted , extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart -, ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtquick1, qtsvg, qttools }: +, ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtsvg, qttools }: stdenv.mkDerivation rec { name = "calamares-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake qtbase qtquick1 qtsvg qttools libyamlcpp python boost polkit-qt parted + cmake qtbase qtsvg qttools libyamlcpp python boost polkit-qt parted extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart ]; -- cgit 1.4.1