kde5: fix all the Qt version dependencies

This commit is contained in:
Thomas Tuegel
2016-07-29 21:13:00 -05:00
parent 0925700688
commit 40b838b94d
30 changed files with 151 additions and 391 deletions

View File

@@ -22,10 +22,6 @@ let
kdeDerivation = args:
let
setupHook =
let drv = { qtbase, qttools }:
makeSetupHook { deps = [ qtbase qttools ]; } ./setup-hook.sh;
in callPackage drv {};
in stdenv.mkDerivation (args // {
outputs = args.outputs or [ "dev" "out" ];
@@ -37,7 +33,7 @@ let
nativeBuildInputs =
(args.nativeBuildInputs or [])
++ [ pkgs.cmake pkgs.pkgconfig setupHook ];
++ [ pkgs.cmake pkgs.pkgconfig ecm ];
});
@@ -62,6 +58,12 @@ let
baloo = callPackage ./baloo.nix {};
bluez-qt = callPackage ./bluez-qt.nix {};
breeze-icons = callPackage ./breeze-icons.nix {};
ecm =
let drv = { qtbase, qttools }:
makeSetupHook
{ deps = [ extra-cmake-modules qtbase qttools ]; }
./setup-hook.sh;
in callPackage drv {};
extra-cmake-modules = callPackage ./extra-cmake-modules {
inherit (srcs.extra-cmake-modules) src version;
};