git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #149159 from helsinki-systems/feat/sogo-mfa
commitc552989bf5088f2fbd92019949965462406319a0 authorJanne Heß <janne@hess.ooo> dateTue 7 Dec 2021, 00:37 (5 years ago) parent94f5bd68f7d8af
1 file changed+8−4
pkgs/servers/web-apps/sogo/default.nix+8−4
pkgs/servers/web-apps/sogo/default.nix+8−4
@@ -1,5 +1,6 @@
11{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir
2−, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests }:
2+, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests
3+, oathToolkit }:
34gnustep.stdenv.mkDerivation rec {
45 pname = "SOGo";
56 version = "5.3.0";
@@ -12,8 +13,7 @@ gnustep.stdenv.mkDerivation rec {
1213 };
1314
1415 nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
15− buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config ]
16− ++ lib.optional (openldap != null) openldap;
16+ buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oathToolkit ];
1717
1818 patches = [
1919 # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches
@@ -41,7 +41,11 @@ gnustep.stdenv.mkDerivation rec {
4141 find . -type f -name GNUmakefile -exec sed -i "s:\\$.GNUSTEP_MAKEFILES.:$PWD/makefiles:g" {} +
4242 '';
4343
44− configureFlags = [ "--disable-debug" "--with-ssl=ssl" ];
44+ configureFlags = [
45+ "--disable-debug"
46+ "--with-ssl=ssl"
47+ "--enable-mfa"
48+ ];
4549
4650 preFixup = ''
4751 # Create gnustep.conf