kde414: build with kdelibs-4.14.12

Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
This commit is contained in:
Thomas Tuegel
2015-09-27 10:11:01 -05:00
parent dd264938bc
commit 2e0589b4ca
56 changed files with 385 additions and 210 deletions

View File

@@ -1,4 +1,6 @@
{ stdenv, fetchurl, cmake, colord, libX11, libXrandr, lcms2, pkgconfig, kdelibs}:
{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
, colord, libX11, libXrandr, lcms2, kdelibs
}:
stdenv.mkDerivation {
name = "colord-kde-0.3.0";
@@ -8,7 +10,9 @@ stdenv.mkDerivation {
sha256 = "ab3cdb7c8c98aa2ee8de32a92f87770e1fbd58eade6471f3f24d932b50b4cf09";
};
buildInputs = [ cmake colord libX11 libXrandr lcms2 pkgconfig kdelibs ];
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
buildInputs = [ colord libX11 libXrandr lcms2 kdelibs ];
enableParallelBuilding = true;

View File

@@ -1,5 +1,7 @@
{ stdenv, fetchurl, cmake, gettext, gtk2, gtk3, kdelibs
, libxcb, libpthreadstubs, libXdmcp, pkgconfig, glib, gdk_pixbuf }:
{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, gtk2, gtk3, kdelibs, libxcb, libpthreadstubs, libXdmcp
, glib, gdk_pixbuf
}:
stdenv.mkDerivation {
name = "kde-gtk-config-2.2.1";
@@ -9,19 +11,11 @@ stdenv.mkDerivation {
};
buildInputs = [
cmake
gdk_pixbuf
gettext
glib
gtk2
gtk3
kdelibs
libxcb
libpthreadstubs
libXdmcp
pkgconfig
gdk_pixbuf glib gtk2 gtk3 kdelibs libxcb libpthreadstubs libXdmcp
];
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
patches = [
./kde-gtk-config-2.2.1-install-paths.patch
./kde-gtk-config-follow-symlinks.patch