From 66bccac913f3c0a06435cf135073b3473c13fc5a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Jul 2020 16:08:51 +0000 Subject: [PATCH] bitlbee: propagate glib dependency bitlbee.pc requires glib, so all packages that depend on bitlbee will also depend on glib. --- .../networking/instant-messengers/bitlbee-discord/default.nix | 2 +- .../instant-messengers/bitlbee-facebook/default.nix | 2 +- .../instant-messengers/bitlbee-mastodon/default.nix | 2 +- .../networking/instant-messengers/bitlbee-steam/default.nix | 2 +- .../networking/instant-messengers/bitlbee/default.nix | 4 +++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 0b6f142f1e9..c4d780d9ea2 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ bitlbee glib ]; + buildInputs = [ bitlbee ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 78016065610..07e7b74a43c 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - buildInputs = [ bitlbee glib json-glib ]; + buildInputs = [ bitlbee json-glib ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index 155ea5edc4d..6a512d340ab 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ bitlbee glib ]; + buildInputs = [ bitlbee ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 14a3319c149..8cb7f6c37c4 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bitlbee autoconf automake libtool glib libgcrypt ]; + buildInputs = [ bitlbee autoconf automake libtool libgcrypt ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index cf3f2549c81..7b1256b657a 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -14,10 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; - buildInputs = [ gnutls glib libotr python ] + buildInputs = [ gnutls libotr python ] ++ optional enableLibPurple pidgin ++ optional enablePam pam; + propagatedBuildInputs = [ glib ]; + configureFlags = [ "--otr=1" "--ssl=gnutls"