From c6e59259fd95d6fbfb567827aefbe5a53988a6dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 24 Aug 2015 00:28:36 +0200 Subject: [PATCH] gnu: hwloc: Propagate libpciaccess. * gnu/packages/mpi.scm (hwloc)[inputs]: Move LIBPCIACCESS to... [propagated-inputs]: ... here. New field. --- gnu/packages/mpi.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 9417e35050..8dba82d8fa 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Eric Bavier -;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; ;;; This file is part of GNU Guix. @@ -57,8 +57,10 @@ (define-public hwloc ("cairo" ,cairo) ("ncurses" ,ncurses) ("numactl" ,numactl) - ("libpciaccess" ,libpciaccess) ("expat" ,expat))) + (propagated-inputs + ;; hwloc.pc lists it in 'Requires.private'. + `(("libpciaccess" ,libpciaccess))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments @@ -72,7 +74,8 @@ (define-public hwloc (numa (assoc-ref inputs "numactl"))) (substitute* (map (lambda (f) (string-append out "/" f)) '("lib/pkgconfig/hwloc.pc" "lib/libhwloc.la")) - (("-lnuma" lib) (string-append "-L" numa "/lib " lib))))))))) + (("-lnuma" lib) + (string-append "-L" numa "/lib " lib))))))))) (home-page "http://www.open-mpi.org/projects/hwloc/") (synopsis "Abstraction of hardware architectures") (description