2 files changed, 1 insertions(+), 11 deletions(-)

M gnu/packages/cyrus-sasl.scm
M gnu/packages/openldap.scm

@@ 45,10 45,7 @@
                (base32
                 "135kbgyfpa1mwqp5dm223yr6ddzi4vjm7cr414d7rmhys2mwdkvw"))))
     (build-system gnu-build-system)
-    (inputs (list gdbm openssl))
-    (propagated-inputs
-     ;; cyrus-sasl.pc refers to -lkrb5, so propagate it.
-     (list mit-krb5))
+    (inputs (list gdbm mit-krb5 openssl))
     (arguments
      (list
       #:configure-flags #~(list (string-append "--with-plugindir="

@@ 101,13 101,6 @@
                        (setenv "CC" (string-append target "-gcc"))
                        (setenv "STRIP" (string-append target "-strip")))))
                  '())
-          (add-after 'install 'patch-sasl-path
-            ;; Give -L arguments for cyrus-sasl to avoid propagation.
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((krb5 (search-input-file inputs "/lib/libkrb5.so")))
-                (substitute* (string-append #$output "/lib/libldap.la")
-                  (("-lkrb5" lib)
-                   (string-append "-L" (dirname krb5) "/lib " lib))))))
           (add-after 'install 'provide-libldap_r
             (lambda _
               ;; The re-entrant libldap_r no longer exists since 2.6