diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-12 12:18:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 12:18:10 -0400 |
| commit | 7b305edde3f5bc9af9a71fd77d1b712fc4eed6dd (patch) | |
| tree | f8f22171da1becc11d88d12a8a994b8d174f1572 /pkgs/servers | |
| parent | 6b92321f822a08e06074b73cb4fac95ab3860172 (diff) | |
| parent | 1fca7a89617dc880ac4274b2a3c6a75257581384 (diff) | |
Merge pull request #68590 from aanderse/zhf/prayer
prayer: fix broken build
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/prayer/default.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index 7997d0ebcd8b9..d1351afa0b301 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, html-tidy, pam}: +{ stdenv, fetchurl, fetchpatch, perl, openssl, db, zlib, uwimap, html-tidy, pam}: let ssl = stdenv.lib.optionals uwimap.withSSL @@ -12,7 +12,20 @@ stdenv.mkDerivation rec { sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda"; }; - patches = [ ./install.patch ]; + patches = [ + ./install.patch + + # fix build errors which result from openssl changes + (fetchpatch { + url = "https://sources.debian.org/data/main/p/prayer/1.3.5-dfsg1-6/debian/patches/disable_ssl3.patch"; + sha256 = "1rx4bidc9prh4gffipykp144cyi3zd6qzd990s2aad3knzv5bkdd"; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/p/prayer/1.3.5-dfsg1-6/debian/patches/openssl1.1.patch"; + sha256 = "0zinylvq3bcifdmki867gir49pbjx6qb5h019hawwif2l4jmlxw1"; + }) + ]; + postPatch = '' sed -i -e s/gmake/make/ -e 's/LDAP_ENABLE.*= true/LDAP_ENABLE=false/' \ ${ssl} \ |