diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-12-09 18:11:14 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-12-09 18:11:14 +0100 |
commit | f80b4d2ce09b0b7770cbdf2f90704d41b0a168c5 (patch) | |
tree | ec47c7ee5d5579cfa00f13b5038ff3d8c87e4a48 /gnu/packages/libunistring.scm | |
parent | 13b5f44b475aa385d580f7e19b907210bc1d6d99 (diff) | |
parent | 2608e40988ba8cf51723fe0d21bdedf6b3997c9c (diff) | |
download | patches-f80b4d2ce09b0b7770cbdf2f90704d41b0a168c5.tar patches-f80b4d2ce09b0b7770cbdf2f90704d41b0a168c5.tar.gz |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'gnu/packages/libunistring.scm')
-rw-r--r-- | gnu/packages/libunistring.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm index f29b7424de..a9779d4ffd 100644 --- a/gnu/packages/libunistring.scm +++ b/gnu/packages/libunistring.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,7 +22,8 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (gnu packages base)) (define-public libunistring (package @@ -35,7 +37,7 @@ (sha256 (base32 "0ixxmgpgh2v8ifm6hbwsjxl023myk3dfnj7wnvmqjivza31fw9cn")))) - (propagated-inputs '()) ; FIXME: add libiconv when !glibc + (propagated-inputs (libiconv-if-needed)) (build-system gnu-build-system) (arguments ;; Work around parallel build issue whereby C files may be compiled before |