From b1568128a0d65e7ff48e42d9f5b29d958c055dc4 Mon Sep 17 00:00:00 2001
From: JEAN-FRANCOIS GUILLAUME <mrbear@yam-it.net>
Date: Thu, 4 Nov 2021 14:04:54 +0100
Subject: [PATCH] looks like inherit does not keep everything

---
 glicid/packages/openldap.scm | 96 ++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 47 deletions(-)

diff --git a/glicid/packages/openldap.scm b/glicid/packages/openldap.scm
index 1d81963..926cbaa 100644
--- a/glicid/packages/openldap.scm
+++ b/glicid/packages/openldap.scm
@@ -14,52 +14,54 @@
 )
 
 (define-public openldap
-    (package
-        (inherit gnu:openldap)
-        (name "openldap")
-        (version "2.5.7")
-        (source (origin
-            (method url-fetch)
-            (uri (list
-                     (string-append "https://www.openldap.org/software/download/OpenLDAP/" "openldap-release/openldap-" version ".tgz")
-                     (string-append "http://gpl.savoirfairelinux.net/pub/mirrors/openldap/" "openldap-release/openldap-" version ".tgz")
-                     (string-append "http://repository.linagora.org/OpenLDAP/" "openldap-release/openldap-" version ".tgz")
-                     (string-append "ftp://ftp.ntua.gr/mirror/OpenLDAP/" "openldap-release/openldap-" version ".tgz")
-                     (string-append "https://mirror-hk.koddos.net/OpenLDAP/" "openldap-release/openldap-" version ".tgz")
-                     (string-append "ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/" "openldap-release/openldap-" version ".tgz")
-                     (string-append "https://mirror.koddos.net/OpenLDAP/" "openldap-release/openldap-" version ".tgz")
-                     (string-append "https://mirror.lyrahosting.com/OpenLDAP/" "openldap-release/openldap-" version ".tgz")
-            ))
-            (sha256 ( base32 "1ayr76sa5hjwldqzis5v71sbp88hd3hysc00gw1raqn33c05g5za" ))
-            )
-        )
-        (build-system gnu-build-system)
-        (inputs `(
-                ("libltdl", libltdl)
-                ("pkg-config", pkg-config)
-                ("libevent", libevent)
-                ("openssl", openssl)
-                ("argon2", argon2)
-                ("wiredtiger", wiredtiger)
-                ("snappy", snappy)
-                ("lz4", lz4)
-                ,@(package-inputs gnu:openldap)
-        ))
-        (arguments '(
-            ; this is needed because the make check does not work inside guix
-            #:configure-flags '(
-                        "--enable-debug" "--enable-dynamic" "--enable-syslog" "--enable-ipv6" "--enable-local" "--enable-slapd" "--enable-dynacl"
-                        "--enable-aci" "--enable-cleartext" "--enable-crypt" "--enable-spasswd" "--enable-modules" "--enable-rlookups" "--enable-slapi"
-                        "--enable-backends=mod" "--enable-overlays=mod" "--enable-argon2" "--enable-balancer" "--disable-static"
-                        "--enable-shared" "--with-tls=openssl"
-            )
-            #:phases (modify-phases %standard-phases
-                (add-before 'build 'make-depend
-                    (lambda* (#:key input #:allow-other-keys)
-                        (invoke "make" "depend")
-                    )
-                )
-            )
-        ))
+  (package
+    (inherit gnu:openldap)
+    (name "openldap")
+    (version "2.5.7")
+    (source (origin
+      (method url-fetch)
+      (uri (list
+        (string-append "https://www.openldap.org/software/download/OpenLDAP/" "openldap-release/openldap-" version ".tgz")
+        (string-append "http://gpl.savoirfairelinux.net/pub/mirrors/openldap/" "openldap-release/openldap-" version ".tgz")
+        (string-append "http://repository.linagora.org/OpenLDAP/" "openldap-release/openldap-" version ".tgz")
+        (string-append "ftp://ftp.ntua.gr/mirror/OpenLDAP/" "openldap-release/openldap-" version ".tgz")
+        (string-append "https://mirror-hk.koddos.net/OpenLDAP/" "openldap-release/openldap-" version ".tgz")
+        (string-append "ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/" "openldap-release/openldap-" version ".tgz")
+        (string-append "https://mirror.koddos.net/OpenLDAP/" "openldap-release/openldap-" version ".tgz")
+        (string-append "https://mirror.lyrahosting.com/OpenLDAP/" "openldap-release/openldap-" version ".tgz")
+      ))
+      (sha256 ( base32 "1ayr76sa5hjwldqzis5v71sbp88hd3hysc00gw1raqn33c05g5za" ))
+      )
     )
+    (build-system gnu-build-system)
+    (inputs `(
+        ("libltdl", libltdl)
+        ("pkg-config", pkg-config)
+        ("libevent", libevent)
+        ("openssl", openssl)
+        ("argon2", argon2)
+        ("wiredtiger", wiredtiger)
+        ("snappy", snappy)
+        ("lz4", lz4)
+        ,@(package-inputs gnu:openldap)
+    ))
+    (arguments '(
+      ; this is needed because the make check does not work inside guix
+      #:tests? #f
+      #:configure-flags '(
+            "--enable-debug" "--enable-dynamic" "--enable-syslog" "--enable-ipv6" "--enable-local" "--enable-slapd" "--enable-dynacl"
+            "--enable-aci" "--enable-cleartext" "--enable-crypt" "--enable-spasswd" "--enable-modules" "--enable-rlookups" "--enable-slapi"
+            "--enable-backends=mod" "--enable-overlays=mod" "--enable-argon2" "--enable-balancer" "--disable-static"
+            "--enable-shared" "--with-tls=openssl"
+      )
+      #:make-flags '("STRIP=")
+      #:phases (modify-phases %standard-phases
+        (add-before 'build 'make-depend
+          (lambda* (#:key input #:allow-other-keys)
+            (invoke "make" "depend")
+          )
+        )
+      )
+    ))
+  )
 )