From: N. 'ng0' Gillmann <ngillmann@runbox.com>
Date: Sat, 1 Oct 2016 18:44:58 +0000 (+0000)
Subject: guix.scm: Add mysql and postgresql as inputs.
X-Git-Tag: initial-import-from-subversion-38251~162
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a5abd6302e11c82aa6b005a3f62d5510211e321c;p=oweals%2Fgnunet.git

guix.scm: Add mysql and postgresql as inputs.
---

diff --git a/guix.scm b/guix.scm
index 0154a02ce..1b49bc0b4 100644
--- a/guix.scm
+++ b/guix.scm
@@ -120,8 +120,8 @@
 
 (define gnunet-svn
   (package
-    (name "gnunet")
-    (version "8000")
+    (name "gnunet-svn")
+    (version (string-append "0.10.1-" "dev"))
     (source
      (local-file %source-dir
                  #:recursive? #t))
@@ -143,6 +143,8 @@
        ("opus" ,opus)
        ("pulseaudio" ,pulseaudio)
        ("sqlite" ,sqlite)
+       ("postgresql" ,postgresql)
+       ("mysql" ,mysql)
        ("zlib" ,zlib)
        ("perl" ,perl)
        ("python" ,python) ; tests and gnunet-qr
@@ -151,6 +153,8 @@
        ("gmp" ,gmp)
        ("bluez" ,bluez) ; for optional bluetooth feature
        ("glib" ,glib)
+       ;; There are currently no binary substitutes for texlive due to
+       ;; its size. Uncomment if you need it.
        ;;("texlive-minimal" ,texlive-minimal) ; optional.
        ("libogg" ,libogg)))
     (native-inputs
@@ -163,6 +167,7 @@
      `(#:configure-flags
        (list (string-append "--with-nssdir=" %output "/lib")
              "--enable-experimental")
+             ;; These appear to be "broken" on Guix, needs debugging.
              ;;"--enable-gcc-hardening"
              ;;"--enable-linker-hardening"
              ;;"--enable-logging=verbose")