diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-03-21 18:46:54 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-03-21 18:46:54 -0500 |
| commit | 2c4c712a7017e32d04622233450e183fe30ffea7 (patch) | |
| tree | 86a1e211d305e00753260d01eed13a87b28ce44b /pkgs/desktops | |
| parent | acd7515a634c9bf94332467437077d39ee2811ee (diff) | |
| download | nixlib-2c4c712a7017e32d04622233450e183fe30ffea7.tar nixlib-2c4c712a7017e32d04622233450e183fe30ffea7.tar.gz nixlib-2c4c712a7017e32d04622233450e183fe30ffea7.tar.bz2 nixlib-2c4c712a7017e32d04622233450e183fe30ffea7.tar.lz nixlib-2c4c712a7017e32d04622233450e183fe30ffea7.tar.xz nixlib-2c4c712a7017e32d04622233450e183fe30ffea7.tar.zst nixlib-2c4c712a7017e32d04622233450e183fe30ffea7.zip | |
kde4: use kdelibs from kdeApps_stable
Upstream is releasing bugfixes to kdelibs only through KDE Applications releases, so this is the correct way to get updates until we discontinue KDE 4. This also ensures that kdeApps and kde4 are using the same version of kdelibs; different versions appear to be causing integration issues.
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-4.14/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix index 2b8e5d313cc7..f11a139aec72 100644 --- a/pkgs/desktops/kde-4.14/default.nix +++ b/pkgs/desktops/kde-4.14/default.nix @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3" }: +{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3", kdelibs }: let branch = "4.14"; @@ -27,6 +27,8 @@ kde.modules // kde.individual // { inherit (kde) manifest modules individual splittedModuleList; + inherit kdelibs; + akonadi = callPackage ./support/akonadi { }; qt4 = qt48; |