aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorN. 'ng0' Gillmann <ngillmann@runbox.com>2016-10-01 18:44:58 +0000
committerN. 'ng0' Gillmann <ngillmann@runbox.com>2016-10-01 18:44:58 +0000
commita5abd6302e11c82aa6b005a3f62d5510211e321c (patch)
tree6e577e3550d49153ce3a980f8850247d69aabbf9
parent2ad0782acfcb580f7961ef82188f38f25624c7fa (diff)
downloadgnunet-a5abd6302e11c82aa6b005a3f62d5510211e321c.tar.gz
gnunet-a5abd6302e11c82aa6b005a3f62d5510211e321c.zip
guix.scm: Add mysql and postgresql as inputs.
-rw-r--r--guix.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/guix.scm b/guix.scm
index 0154a02ce..1b49bc0b4 100644
--- a/guix.scm
+++ b/guix.scm
@@ -120,8 +120,8 @@
120 120
121(define gnunet-svn 121(define gnunet-svn
122 (package 122 (package
123 (name "gnunet") 123 (name "gnunet-svn")
124 (version "8000") 124 (version (string-append "0.10.1-" "dev"))
125 (source 125 (source
126 (local-file %source-dir 126 (local-file %source-dir
127 #:recursive? #t)) 127 #:recursive? #t))
@@ -143,6 +143,8 @@
143 ("opus" ,opus) 143 ("opus" ,opus)
144 ("pulseaudio" ,pulseaudio) 144 ("pulseaudio" ,pulseaudio)
145 ("sqlite" ,sqlite) 145 ("sqlite" ,sqlite)
146 ("postgresql" ,postgresql)
147 ("mysql" ,mysql)
146 ("zlib" ,zlib) 148 ("zlib" ,zlib)
147 ("perl" ,perl) 149 ("perl" ,perl)
148 ("python" ,python) ; tests and gnunet-qr 150 ("python" ,python) ; tests and gnunet-qr
@@ -151,6 +153,8 @@
151 ("gmp" ,gmp) 153 ("gmp" ,gmp)
152 ("bluez" ,bluez) ; for optional bluetooth feature 154 ("bluez" ,bluez) ; for optional bluetooth feature
153 ("glib" ,glib) 155 ("glib" ,glib)
156 ;; There are currently no binary substitutes for texlive due to
157 ;; its size. Uncomment if you need it.
154 ;;("texlive-minimal" ,texlive-minimal) ; optional. 158 ;;("texlive-minimal" ,texlive-minimal) ; optional.
155 ("libogg" ,libogg))) 159 ("libogg" ,libogg)))
156 (native-inputs 160 (native-inputs
@@ -163,6 +167,7 @@
163 `(#:configure-flags 167 `(#:configure-flags
164 (list (string-append "--with-nssdir=" %output "/lib") 168 (list (string-append "--with-nssdir=" %output "/lib")
165 "--enable-experimental") 169 "--enable-experimental")
170 ;; These appear to be "broken" on Guix, needs debugging.
166 ;;"--enable-gcc-hardening" 171 ;;"--enable-gcc-hardening"
167 ;;"--enable-linker-hardening" 172 ;;"--enable-linker-hardening"
168 ;;"--enable-logging=verbose") 173 ;;"--enable-logging=verbose")