Patchwork [05/11] gnu: libunistring: support mingw: propagate libiconv if needed.

login
register
mail settings
Submitter Jan Nieuwenhuizen
Date Aug. 9, 2016, 6:41 a.m.
Message ID <20160809064139.27872-6-janneke@gnu.org>
Download mbox | patch
Permalink /patch/14444/
State New
Headers show

Comments

Jan Nieuwenhuizen - Aug. 9, 2016, 6:41 a.m.
* gnu/packages/libunistring (libunistring): propagated-inputs: add
libiconv-if-needed.  Fixes unicode translation in mingw.
---
 gnu/packages/libunistring.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Alex Kost - Aug. 9, 2016, 7:37 a.m.
Jan Nieuwenhuizen (2016-08-09 09:41 +0300) wrote:

[...]
>  (define-public libunistring
>    (package
> @@ -35,7 +37,7 @@
>              (sha256
>               (base32
>                "0ixxmgpgh2v8ifm6hbwsjxl023myk3dfnj7wnvmqjivza31fw9cn"))))
> -   (propagated-inputs '())                  ; FIXME: add libiconv when !glibc
> +   (propagated-inputs `(,@(libiconv-if-needed)))

Or simply:

      (propagated-inputs (libiconv-if-needed))

>     (build-system gnu-build-system)
>     (arguments
>      ;; Work around parallel build issue whereby C files may be compiled before
Jan Nieuwenhuizen - Aug. 9, 2016, 4 p.m.
Alex Kost writes:

>> -   (propagated-inputs '())                  ; FIXME: add libiconv when !glibc
>> +   (propagated-inputs `(,@(libiconv-if-needed)))
>
> Or simply:
>
>       (propagated-inputs (libiconv-if-needed))

Ok, thanks.

Greetings,
Jan

Patch

diff --git a/gnu/packages/libunistring.scm b/gnu/packages/libunistring.scm
index f29b742..d2feac2 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