alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

kde4: use kdelibs from kdeApps_stable

Browse source 
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.
This commit is contained in:
Thomas Tuegel 2015-03-21 18:46:54 -05:00
parent acd7515a63
commit 2c4c712a70
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/kde-apps-14.12/default.nix
View file

@ -281,10 +281,10 @@ let
buildInputs = super.kremotecontrol.buildInputs ++ [xlibs.libXtst];
};
krfb = with pkgs; super.krfb // {
krfb = super.krfb // {
buildInputs =
super.krfb.buildInputs
++ [xlibs.libXtst kde4.telepathy.common_internals];
++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals];
};
libkdcraw = with pkgs; super.libkdcraw // {

4
pkgs/desktops/kde-4.14/default.nix
View file

@ -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;

5
pkgs/top-level/all-packages.nix
View file

@ -10841,6 +10841,10 @@ let
kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
kf5 = kf57;
qt5 = qt54;
pkgs = pkgs // {
cmake = cmake-3_2;
};
kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
});
kdeApps_stable = kdeApps_14_12;
kdeApps_latest = kdeApps_14_12;
@ -12840,6 +12844,7 @@ let
callPackage = newScope (self // { cmake = cmake-3_2; });
kde4 = callPackageOrig dir {
inherit callPackage callPackageOrig;
kdelibs = kdeApps_stable.kdelibs;
};
in kde4 // {
inherit kde4;