[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: gnu: plotutils: Do not propagate libXaw.
From: |
Ludovic Courtès |
Subject: |
02/04: gnu: plotutils: Do not propagate libXaw. |
Date: |
Thu, 15 Jan 2015 22:10:14 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit ceae3fef44f96ccab6f36135cf9e74a341ec84ff
Author: Ludovic Courtès <address@hidden>
Date: Thu Jan 15 15:04:45 2015 +0100
gnu: plotutils: Do not propagate libXaw.
* gnu/packages/plotutils.scm (plotutils): Move LIBXAW from
'propagated-inputs' to 'inputs'. Add 'snippet'.
---
gnu/packages/plotutils.scm | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index eae8aba..41df880 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -36,14 +36,21 @@
(sha256
(base32
"1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg"))
- (patches (list (search-patch "plotutils-libpng-jmpbuf.patch")))))
+ (patches (list (search-patch "plotutils-libpng-jmpbuf.patch")))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Force the use of libXaw7 instead of libXaw. When not doing
+ ;; that, libplot.la ends up containing just "-lXaw" (without
+ ;; "-L/path/to/Xaw"), due to the fact that there is no
+ ;; libXaw.la, which forces us to propagate libXaw.
+ '(substitute* "configure"
+ (("-lXaw")
+ "-lXaw7")))))
(build-system gnu-build-system)
(inputs `(("libpng" ,libpng)
("libx11" ,libx11)
- ("libxt" ,libxt)))
-
- ;; libplot.la has '-lXaw'.
- (propagated-inputs `(("libxaw" ,libxaw)))
+ ("libxt" ,libxt)
+ ("libxaw" ,libxaw)))
(home-page
"http://www.gnu.org/software/plotutils/")