diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-05 18:03:42 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-21 15:49:54 -0400 |
commit | f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1 (patch) | |
tree | e853e7da55b09acd1d622991491c1a696f9857ef /pkgs/applications/networking/instant-messengers/telepathy/logger | |
parent | 531e4b80c97002a542beb8fe356177ebd66cdd8e (diff) | |
download | nixlib-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar nixlib-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.gz nixlib-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.bz2 nixlib-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.lz nixlib-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.xz nixlib-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.tar.zst nixlib-f8a18cd4cf2e3d249fede58e0b7cc0aea06e3bc1.zip |
misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed
Importantly, this included regenerating pkgs/servers/x11/xorg, to clobber the old sed.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/telepathy/logger')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
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 = '' |