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

calamares: fix Qt dependencies

This commit is contained in:
Thomas Tuegel 2015-12-17 05:50:32 -06:00
parent a685f98627
commit 97b2b05a24
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/misc/calamares/default.nix
View File

@ -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 , 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 { stdenv.mkDerivation rec {
name = "calamares-${version}"; name = "calamares-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ 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 extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart
]; ];
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
''; '';
preInstall = '' preInstall = ''
substituteInPlace cmake_install.cmake --replace "${polkit_qt5}" "$out" substituteInPlace cmake_install.cmake --replace "${polkitQt}" "$out"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {