[PATCH] gnu: shishi: Add more inputs for libidn and PAM support

[PATCH] gnu: shishi: Add more inputs for libidn and PAM support

[Mark H Weaver]

[-- Attachment #1: [PATCH] gnu: shishi: Add more inputs for libidn and PAM support --]
[-- Type: text/x-patch, Size: 1666 bytes --]

From dec2fd78c2bf9fc0081423854eee9794e7945b08 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Tue, 18 Feb 2014 10:34:04 -0500
Subject: [PATCH] gnu: shishi: Add more inputs for libidn and PAM support.

* gnu/packages/shishi.scm (shishi): Add 'pkg-config' native-input.
  Add 'libidn' and 'linux-pam' inputs.
---
 gnu/packages/shishi.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/shishi.scm b/gnu/packages/shishi.scm
index 0523a4e..47e7802 100644
--- a/gnu/packages/shishi.scm
+++ b/gnu/packages/shishi.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,6 +23,9 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages gnutls)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages libidn)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages compression)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -40,8 +44,11 @@
        (base32
         "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d"))))
     (build-system gnu-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)))
     (inputs
      `(("gnutls" ,gnutls)
+       ("libidn" ,libidn)
+       ("linux-pam" ,linux-pam)
        ("zlib" ,zlib)
        ;; libgcrypt 1.6 fails because of the following test:
        ;;  #include <gcrypt.h>
-- 
1.8.4

Re: [PATCH] gnu: shishi: Add more inputs for libidn and PAM support

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> From dec2fd78c2bf9fc0081423854eee9794e7945b08 Mon Sep 17 00:00:00 2001
> From: Mark H Weaver <mhw@netris.org>
> Date: Tue, 18 Feb 2014 10:34:04 -0500
> Subject: [PATCH] gnu: shishi: Add more inputs for libidn and PAM support.
>
> * gnu/packages/shishi.scm (shishi): Add 'pkg-config' native-input.
>   Add 'libidn' and 'linux-pam' inputs.

Does it really need libidn?  Glibc is supposed to use it already
somehow, no?

Otherwise OK to push.

Thanks,
Ludo’.

Re: [PATCH] gnu: shishi: Add more inputs for libidn and PAM support

[Mark H Weaver]

ludo@gnu.org (Ludovic Courtès) writes:

> Mark H Weaver <mhw@netris.org> skribis:
>
>> From dec2fd78c2bf9fc0081423854eee9794e7945b08 Mon Sep 17 00:00:00 2001
>> From: Mark H Weaver <mhw@netris.org>
>> Date: Tue, 18 Feb 2014 10:34:04 -0500
>> Subject: [PATCH] gnu: shishi: Add more inputs for libidn and PAM support.
>>
>> * gnu/packages/shishi.scm (shishi): Add 'pkg-config' native-input.
>>   Add 'libidn' and 'linux-pam' inputs.
>
> Does it really need libidn?  Glibc is supposed to use it already
> somehow, no?

Without it, configure outputs this, which seems suboptimal:

--8<---------------cut here---------------start------------->8---
checking for libidn... no
configure: WARNING: Libidn not found.  String process disabled.
checking if String processing support via Libidn should be built... no
--8<---------------cut here---------------end--------------->8---

> Otherwise OK to push.

    Thanks,
      Mark

Re: [PATCH] gnu: shishi: Add more inputs for libidn and PAM support

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> ludo@gnu.org (Ludovic Courtès) writes:
>
>> Mark H Weaver <mhw@netris.org> skribis:
>>
>>> From dec2fd78c2bf9fc0081423854eee9794e7945b08 Mon Sep 17 00:00:00 2001
>>> From: Mark H Weaver <mhw@netris.org>
>>> Date: Tue, 18 Feb 2014 10:34:04 -0500
>>> Subject: [PATCH] gnu: shishi: Add more inputs for libidn and PAM support.
>>>
>>> * gnu/packages/shishi.scm (shishi): Add 'pkg-config' native-input.
>>>   Add 'libidn' and 'linux-pam' inputs.
>>
>> Does it really need libidn?  Glibc is supposed to use it already
>> somehow, no?
>
> Without it, configure outputs this, which seems suboptimal:
>
> checking for libidn... no
> configure: WARNING: Libidn not found.  String process disabled.
> checking if String processing support via Libidn should be built... no

Ah OK, perfect then!

Ludo’.