diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-26 06:49:15 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-27 11:49:46 -0600 |
commit | 127bf18a350afa562cad3f8cb3b2f626edd23de0 (patch) | |
tree | 3edc31bedef41e96f6a7f5062fb26e3950671a59 /pkgs/top-level/all-packages.nix | |
parent | b39e491eb521d93ae983bc63b10efad3d147a9cd (diff) |
extra-cmake-modules: Lift Qt dependency
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 297aae6147e12..0571966d15b41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6292,7 +6292,7 @@ with pkgs; cmakeWithGui = cmakeCurses.override { useQt4 = true; }; # Does not actually depend on Qt 5 - extra-cmake-modules = libsForQt5.ecmNoHooks; + inherit (kdeFrameworks) extra-cmake-modules; coccinelle = callPackage ../development/tools/misc/coccinelle { ocamlPackages = ocamlPackages_4_01_0; @@ -7852,6 +7852,16 @@ with pkgs; judy = callPackage ../development/libraries/judy { }; + kdeFrameworks = + let + mkFrameworks = import ../development/libraries/kde-frameworks; + attrs = { + inherit libsForQt5; + inherit kdeDerivation lib fetchurl; + }; + in + recurseIntoAttrs (makeOverridable mkFrameworks attrs); + kdelibs4 = kdeApplications.kdelibs; keybinder = callPackage ../development/libraries/keybinder { @@ -9341,12 +9351,14 @@ with pkgs; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; - mkLibsForQt5 = self: with self; - let kdeFrameworks = import ../development/libraries/kde-frameworks { - inherit (self) newScope; - inherit kdeDerivation lib fetchurl; - }; - in { + mkLibsForQt5 = self: with self; { + + ### KDE FRAMEWORKS + + inherit (kdeFrameworks.override { libsForQt5 = self; }) + attica; + + ### LIBRARIES ### BUILD SUPPORT @@ -9426,7 +9438,7 @@ with pkgs; qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { }; - } // kdeFrameworks; + }; qtEnv = qt5.env; qt5Full = qt5.full; @@ -12140,6 +12152,8 @@ with pkgs; bgnet = callPackage ../data/documentation/bgnet { }; + inherit (kdeFrameworks) breeze-icons; + cacert = callPackage ../data/misc/cacert { }; caladea = callPackage ../data/fonts/caladea {}; @@ -12376,6 +12390,8 @@ with pkgs; oxygenfonts = callPackage ../data/fonts/oxygenfonts { }; + inherit (kdeFrameworks) oxygen-icons5; + paper-icon-theme = callPackage ../data/icons/paper-icon-theme { }; pecita = callPackage ../data/fonts/pecita {}; |