From 7f245a7843a162ea76e560161d63283ffa50b2c6 Mon Sep 17 00:00:00 2001
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Fri, 2 Feb 2024 19:03:55 +0100
Subject: gnu: apr: Add libxcrypt dependency.

* gnu/packages/apr.scm (apr): Add libxcrypt dependency.

Change-Id: Ib43ea0e3933e0df27654638150f21b8f8f504512
---
 gnu/packages/apr.scm | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm
index 3bd4d1ecce..b3bb1f80e3 100644
--- a/gnu/packages/apr.scm
+++ b/gnu/packages/apr.scm
@@ -26,6 +26,7 @@ (define-module (gnu packages apr)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages autotools))
@@ -51,16 +52,25 @@ (define-public apr
      ;; Thus, build sequentially.
      `(#:parallel-build? #f
        #:parallel-tests? #f
-       ,@(if (target-ppc32?)
-           `(#:phases
-             (modify-phases %standard-phases
-               (add-after 'unpack 'patch-sources
-                 (lambda* (#:key inputs native-inputs #:allow-other-keys)
-                   (invoke "patch" "-p1" "--force" "--input"
-                           (assoc-ref (or native-inputs inputs)
-                                      "atomics-patch"))))))
-           '())))
-    (inputs (list perl libltdl))
+       #:phases
+       (modify-phases %standard-phases
+         ,@(if (target-ppc32?)
+               `((add-after 'unpack 'patch-sources
+                   (lambda* (#:key inputs native-inputs #:allow-other-keys)
+                     (invoke "patch" "-p1" "--force" "--input"
+                             (assoc-ref (or native-inputs inputs)
+                                        "atomics-patch")))))
+               '())
+         (add-after 'install 'patch-libxcrypt-reference
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (define out (assoc-ref outputs "out"))
+             (define libxcrypt
+               (dirname (search-input-file inputs "/lib/libcrypt.so.1")))
+             (substitute* (list (string-append out "/bin/apr-1-config")
+                                (string-append out "/lib/pkgconfig/apr-1.pc"))
+               (("-lcrypt")
+                (string-append "-L" libxcrypt " -lcrypt"))))))))
+    (inputs (list perl libltdl libxcrypt))
     (native-inputs
      `(,@(if (target-ppc32?)
            `(("atomics-patch"
-- 
cgit v1.2.3