unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Lukas Gradl <lgradl@openmailbox.org>
To: guix-devel@gnu.org
Subject: Re: [Patch 5/10] opendht: Propagate argon2.
Date: Mon, 12 Sep 2016 21:27:20 -0500	[thread overview]
Message-ID: <87y42wzg8n.fsf@openmailbox.org> (raw)
In-Reply-To: <87mvjc1quq.fsf@openmailbox.org> (Lukas Gradl's message of "Mon, 12 Sep 2016 21:22:05 -0500")


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1: 0005-gnu-opendht-Propagate-argon2.patch --]
[-- Type: text/x-patch, Size: 1593 bytes --]

From 5f14484f9d66cc5c40a19de9d58190d0b2b63342 Mon Sep 17 00:00:00 2001
From: Lukas Gradl <lgradl@openmailbox.org>
Date: Tue, 9 Aug 2016 17:00:52 -0500
Subject: [PATCH 05/10] gnu: opendht: Propagate argon2.

* gnu/packages/crypto.scm (opendht)[source]: Add argon2 to pkg-config file.
[inputs]: Remove argon2.
[propagated-inputs]: Add argon2.
---
 gnu/packages/crypto.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 5dad97c..850ee71 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -125,7 +125,11 @@ OpenBSD tool of the same name.")
            (substitute* "src/crypto.cpp"
              (("argon2/argon2.h") "argon2.h"))
            (substitute* "configure.ac"
-             (("src/argon2/Makefile") ""))))
+             (("src/argon2/Makefile") ""))
+           (substitute* "opendht.pc.in"
+             (("Libs: -L..libdir. -lopendht")
+              (string-append "Libs: -L${libdir} -lopendht\n"
+                             "Requires: argon2")))))
        (sha256
         (base32
          "09yvkmbqbym3b5md4n96qc1s9sf2n8ji404hagih45rmsj49599x"))))
@@ -134,8 +138,9 @@ OpenBSD tool of the same name.")
      `(("gnutls" ,gnutls)
        ("nettle" ,nettle)
        ("msgpack" ,msgpack)
-       ("readline" ,readline)
-       ("argon2" ,argon2)))
+       ("readline" ,readline)))
+    (propagated-inputs
+     `(("argon2" ,argon2)))
     (native-inputs
      `(("autoconf" ,autoconf)
        ("pkg-config" ,pkg-config)
-- 
2.9.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]

  parent reply	other threads:[~2016-09-13  2:27 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-13  2:22 [Patch 0/10] Add Ring Lukas Gradl
2016-09-13  2:23 ` [Patch 1/10] Add pjproject Lukas Gradl
2016-09-19  7:41   ` Ricardo Wurmus
2016-09-20  5:39     ` Lukas Gradl
2016-09-22  2:46       ` Ricardo Wurmus
2016-09-26  6:41         ` Lukas Gradl
2016-11-05 22:25           ` Ricardo Wurmus
2016-11-05 22:49             ` Mathieu Lirzin
2016-11-05 22:54               ` Ricardo Wurmus
2016-09-13  2:24 ` [Patch 2/10] Add dbus-c++ Lukas Gradl
2016-09-28  9:09   ` Ludovic Courtès
2016-09-13  2:25 ` [Patch 3/10] Add gsm Lukas Gradl
2016-09-28  9:16   ` Ludovic Courtès
2016-09-13  2:26 ` [Patch 4/10] argon2: Install pkg-config file Lukas Gradl
2016-09-15 21:24   ` Danny Milosavljevic
2016-09-17 16:47     ` Lukas Gradl
2016-09-18 21:32       ` Lukas Gradl
2016-09-18 21:43     ` Lukas Gradl
2016-09-19 19:15       ` Danny Milosavljevic
2016-09-25 22:45         ` Lukas Gradl
2016-09-25 23:13           ` Danny Milosavljevic
2016-09-25 23:32             ` Lukas Gradl
2016-09-28  9:18               ` Ludovic Courtès
2016-09-13  2:27 ` Lukas Gradl [this message]
2016-09-25 22:54   ` [Patch 5/10] opendht: Propagate argon2 Lukas Gradl
2016-09-25 23:24     ` Danny Milosavljevic
2016-09-25 23:43       ` Lukas Gradl
2016-09-13  2:28 ` [Patch 6/10] telephony: Add license prefix Lukas Gradl
2016-09-15 21:25   ` Danny Milosavljevic
2016-09-28  9:25   ` Ludovic Courtès
2016-09-13  2:29 ` [Patch 7/10] opendht: Propagate msgpack Lukas Gradl
2016-09-28  9:48   ` Ludovic Courtès
2016-09-13  2:30 ` [Patch 8/10] Add libring Lukas Gradl
2016-11-05 22:30   ` Ricardo Wurmus
2016-09-13  2:30 ` [Patch 9/10] Add libringclient Lukas Gradl
2016-09-13  2:31 ` [Patch 10/10] Add ring-client-gnome Lukas Gradl
2016-09-15 21:27   ` Danny Milosavljevic
2016-09-17 16:38     ` Lukas Gradl
2016-09-25 23:23       ` Lukas Gradl
2016-09-25 23:35       ` GNOME Settings Schemas - How are they searched for? Danny Milosavljevic
2016-10-23 15:36         ` Pjotr Prins
2016-11-05  4:59 ` [Patch 0/10] Add Ring Chris Marusich
2016-11-09 18:07   ` Lukas Gradl
2016-11-09 22:43     ` Leo Famulari
2016-11-12 23:39       ` Lukas Gradl
2016-11-13  0:52     ` Mike Gerwitz
2016-11-13 21:00       ` Lukas Gradl

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87y42wzg8n.fsf@openmailbox.org \
    --to=lgradl@openmailbox.org \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).