ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cyrus-sasl: Do not propagate Kerberos.

Browse source 
* gnu/packages/cyrus-sasl.scm (cyrus-sasl)[propagated-inputs]: Move MIT-KRB5 ...
[inputs]: ... here.
* gnu/packages/openldap.scm (openldap)[arguments]: Don't add krb5 linker arguments.
This commit is contained in:
Marius Bakke 2022-07-22 14:50:02 +02:00
parent 1ecf710cae
commit 0de5e6d653
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/cyrus-sasl.scm
View file

@ -45,10 +45,7 @@ (define-public cyrus-sasl
(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="

7
gnu/packages/openldap.scm
View file

@ -101,13 +101,6 @@ (define-public openldap
(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