Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e3acb2485aad
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 66bccac913f3
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Jul 15, 2020

  1. bitlbee: propagate glib dependency 

    bitlbee.pc requires glib, so all packages that depend on bitlbee will
also depend on glib.
    @alyssais
    alyssais committed Jul 15, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    66bccac View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ bitlbee glib ];
buildInputs = [ bitlbee ];

preConfigure = ''
export BITLBEE_PLUGINDIR=$out/lib/bitlbee
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ bitlbee glib ];
buildInputs = [ bitlbee ];

preConfigure = ''
export BITLBEE_PLUGINDIR=$out/lib/bitlbee
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion pkgs/applications/networking/instant-messengers/bitlbee/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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"