From 97b2b05a24c0720f9f84e376902c268cc80ce6bc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 17 Dec 2015 05:50:32 -0600 Subject: [PATCH] calamares: fix Qt dependencies --- pkgs/tools/misc/calamares/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index e2b8c70c6e2..6ca007229bc 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, cmake, qt5, polkit_qt5, libyamlcpp, python, boost, parted +{ stdenv, fetchgit, cmake, polkitQt, libyamlcpp, python, boost, parted , extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart -, ckbcomp, glibc, tzdata, xkeyboard_config }: +, ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtquick1, qtsvg, qttools }: stdenv.mkDerivation rec { name = "calamares-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake qt5.base qt5.tools libyamlcpp python boost polkit_qt5 parted + cmake qtbase qtquick1 qtsvg qttools libyamlcpp python boost polkitQt parted extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; preInstall = '' - substituteInPlace cmake_install.cmake --replace "${polkit_qt5}" "$out" + substituteInPlace cmake_install.cmake --replace "${polkitQt}" "$out" ''; meta = with stdenv.lib; {