From 466af8e8ddf70bc70d9a141590bdd78dd7cfd1f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 7 Jul 2012 20:28:03 +0200
Subject: [PATCH] distro: guile-2.0: Propagate libunistring and Libtool.
* distro/base.scm (guile-2.0): Propagate libunistring and Libtool.
---
distro/base.scm | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/distro/base.scm b/distro/base.scm
index 91c79811c49..0a87948af3a 100644
--- a/distro/base.scm
+++ b/distro/base.scm
@@ -173,15 +173,21 @@ (define-public guile-2.0
(build-system gnu-build-system)
(native-inputs `(("xz" ,(nixpkgs-derivation "xz"))
("pkgconfig" ,(nixpkgs-derivation "pkgconfig"))))
- (inputs `(("libunistring" ,(nixpkgs-derivation "libunistring"))
- ("libffi" ,(nixpkgs-derivation "libffi"))
- ("libtool" ,(nixpkgs-derivation "libtool"))
+ (inputs `(("libffi" ,(nixpkgs-derivation "libffi"))
("readline" ,(nixpkgs-derivation "readline"))))
- ;; The headers and/or `guile-2.0.pc' refer to these packages, so they must
- ;; be propagated.
- (propagated-inputs `(("bdw-gc" ,(nixpkgs-derivation "boehmgc"))
- ("gmp" ,(nixpkgs-derivation "gmp"))))
+ (propagated-inputs
+ `( ;; These ones aren't normally needed here, but since `libguile-2.0.la'
+ ;; reads `-lltdl -lunistring', adding them here will add the needed
+ ;; `-L' flags. As for why the `.la' file lacks the `-L' flags, see
+ ;; <http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903>.
+ ("libunistring" ,(nixpkgs-derivation "libunistring"))
+ ("libtool" ,(nixpkgs-derivation "libtool"))
+
+ ;; The headers and/or `guile-2.0.pc' refer to these packages, so they
+ ;; must be propagated.
+ ("bdw-gc" ,(nixpkgs-derivation "boehmgc"))
+ ("gmp" ,(nixpkgs-derivation "gmp"))))
(self-native-input? #t)
--
GitLab