diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-10-04 12:48:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-04 12:48:09 +0200 |
commit | b9e7935eff113ee3ba75310a78a7cea2a39b8aba (patch) | |
tree | d2b2265c57ec8953496c3afcbb7c2a14be1b23bd /pkgs/applications/networking | |
parent | 4569dd753b8d15d5a7f96febdb0eecf2af7f6302 (diff) | |
parent | d334c1c1d00038801e5c243496105e6f02822eb8 (diff) | |
download | nixpkgs-b9e7935eff113ee3ba75310a78a7cea2a39b8aba.tar nixpkgs-b9e7935eff113ee3ba75310a78a7cea2a39b8aba.tar.gz nixpkgs-b9e7935eff113ee3ba75310a78a7cea2a39b8aba.tar.bz2 nixpkgs-b9e7935eff113ee3ba75310a78a7cea2a39b8aba.tar.lz nixpkgs-b9e7935eff113ee3ba75310a78a7cea2a39b8aba.tar.xz nixpkgs-b9e7935eff113ee3ba75310a78a7cea2a39b8aba.tar.zst nixpkgs-b9e7935eff113ee3ba75310a78a7cea2a39b8aba.zip |
Merge pull request #47603 from Mic92/bitlbee
nixos/bitlbee: add pam option
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/bitlbee/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 2ed7fbcee3b..fbd326919f3 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,5 +1,7 @@ -{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python, -enableLibPurple ? false, pidgin ? null }: +{ fetchurl, stdenv, gnutls, glib, pkgconfig, check, libotr, python +, enableLibPurple ? false, pidgin ? null +, enablePam ? false, pam ? null +}: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,19 +15,23 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; buildInputs = [ gnutls glib libotr python ] - ++ optional enableLibPurple pidgin; + ++ optional enableLibPurple pidgin + ++ optional enablePam pam; configureFlags = [ - "--gcov=1" "--otr=1" "--ssl=gnutls" "--pidfile=/var/lib/bitlbee/bitlbee.pid" - ] - ++ optional enableLibPurple "--purple=1"; + ] ++ optional enableLibPurple "--purple=1" + ++ optional enablePam "--pam=1"; installTargets = [ "install" "install-dev" ]; doCheck = !enableLibPurple; # Checks fail with libpurple for some reason + checkPhase = '' + # check flags set VERBOSE=y which breaks the build due overriding a command + make check + ''; enableParallelBuilding = true; |