cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #149159 from helsinki-systems/feat/sogo-mfa

Browse source
This commit is contained in:
Janne Heß 2021-12-07 00:37:26 +01:00 committed by GitHub
commit c552989bf5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/servers/web-apps/sogo/default.nix
View file

@ -1,5 +1,6 @@
{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir
, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests }:
, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests
, oathToolkit }:
gnustep.stdenv.mkDerivation rec {
pname = "SOGo";
version = "5.3.0";
@ -12,8 +13,7 @@ gnustep.stdenv.mkDerivation rec {
};
nativeBuildInputs = [ gnustep.make makeWrapper python3 ];
buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config ]
++ lib.optional (openldap != null) openldap;
buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oathToolkit ];
patches = [
# 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 {
find . -type f -name GNUmakefile -exec sed -i "s:\\$.GNUSTEP_MAKEFILES.:$PWD/makefiles:g" {} +
'';
configureFlags = [ "--disable-debug" "--with-ssl=ssl" ];
configureFlags = [
"--disable-debug"
"--with-ssl=ssl"
"--enable-mfa"
];
preFixup = ''
# Create gnustep.conf