From f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 5 Sep 2017 18:03:42 -0400 Subject: misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed Importantly, this included regenerating pkgs/servers/x11/xorg, to clobber the old sed. --- .../networking/instant-messengers/telepathy/logger/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix') diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 721e4eba84ff..0bd6c2e5f2b5 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -12,12 +12,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool makeWrapper + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool libxslt gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ]; - nativeBuildInputs = [ libxslt ]; - configureFlags = "--enable-call"; preFixup = '' -- cgit 1.4.1