diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 10:11:01 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-09-27 15:08:12 -0500 |
commit | 2e0589b4ca8f43dbce3e5af91c6e4375681ebee5 (patch) | |
tree | e2b3b4f6ec45ed280d298363f3a40eb2a510f789 /pkgs/applications/networking/instant-messengers/telepathy | |
parent | dd264938bc1df93a66f7647d9ace267a241a3da7 (diff) |
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.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telepathy')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index 564952480f23b..532d68ad66050 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -1,12 +1,19 @@ -{ stdenv, fetchurl, fetchgit, telepathy_qt, kdelibs, kde_workspace, gettext, dbus_libs, farstream -, pkgconfigUpstream , qt_gstreamer1, telepathy_glib, telepathy_logger, qjson, flex, bison, qca2 }: +{ stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig +, telepathy_qt, kdelibs, kde_workspace, dbus_glib, dbus_libs, farstream +, qt_gstreamer1, telepathy_glib, telepathy_logger +, qjson, flex, bison, qca2 }: let - pkgconfig = pkgconfigUpstream; version = "0.8.80"; manifest = import (./. + "/${version}.nix"); overrides = { + call_ui = x : x // { + NIX_CFLAGS_COMPILE = + "-I${telepathy_glib}/include/telepathy-1.0" + + " -I${dbus_glib}/include/dbus-1.0" + + " -I${dbus_libs}/include/dbus-1.0"; + }; telepathy_logger_qt = x : x // { NIX_CFLAGS_COMPILE = "-I${dbus_libs}/include/dbus-1.0"; }; @@ -38,7 +45,9 @@ let inherit sha256; }; - nativeBuildInputs = [ gettext pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs); + nativeBuildInputs = + [ automoc4 cmake gettext perl pkgconfig ] + ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs); buildInputs = [ kdelibs telepathy_qt ] ++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals ++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs); |