summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-07-02 01:34:36 +0200
committerLudovic Courtès <ludo@gnu.org>2012-07-02 01:35:39 +0200
commit888f72e97f710a0292fb5eee92179f6e19990fd8 (patch)
tree2c79eea594f147fadd5951a0e5e0b8d3c065ae0c
parent9336b5ab551a36c3ff48dc82f2b4651989cd3afd (diff)
downloadguix-888f72e97f710a0292fb5eee92179f6e19990fd8.tar.gz
distro: libsigsegv: Use multiple outputs.
* distro/base.scm (libsigsegv)[outputs]: New field
  (gawk)[arguments]: Clear.
  [inputs]: Add the "lib" output of LIBSIGSEGV.
-rw-r--r--distro/base.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/distro/base.scm b/distro/base.scm
index 6e5b36aec3..c9d2ae8033 100644
--- a/distro/base.scm
+++ b/distro/base.scm
@@ -39,6 +39,7 @@
              (nix-base32-string->bytevector  ; TODO: make conversion implicit
               "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44"))))
    (build-system gnu-build-system)
+   (outputs '("out" "lib"))                   ; separate libdir from the rest
    (home-page "http://www.gnu.org/software/libsigsegv/")
    (description "GNU libsigsegv, a library to handle page faults in user mode")
    (long-description
@@ -61,12 +62,11 @@ handlers, distributed shared memory, and more.")
              (nix-base32-string->bytevector
               "0sss7rhpvizi2a88h6giv0i7w5h07s2fxkw3s6n1hqvcnhrfgbb0"))))
    (build-system gnu-build-system)
-   (arguments '(#:configure-flags
-                `(,(string-append "--with-libsigsegv-prefix="
-                                  (assoc-ref %build-inputs "libsigsegv"))))
+   (arguments '()
               ;; TODO: disable tests on Cygwin
               )
-   (inputs `(("libsigsegv" ,libsigsegv)))
+   (inputs `(("libsigsegv" ,libsigsegv)             ; headers
+             ("libsigsegv/lib" ,libsigsegv "lib"))) ; library
    (home-page "http://www.gnu.org/software/gawk/")
    (description "GNU implementation of the Awk programming language")
    (long-description