projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2ad0782
)
guix.scm: Add mysql and postgresql as inputs.
author
N. 'ng0' Gillmann
<ngillmann@runbox.com>
Sat, 1 Oct 2016 18:44:58 +0000
(18:44 +0000)
committer
N. 'ng0' Gillmann
<ngillmann@runbox.com>
Sat, 1 Oct 2016 18:44:58 +0000
(18:44 +0000)
guix.scm
patch
|
blob
|
history
diff --git
a/guix.scm
b/guix.scm
index 0154a02ce4aa5d2d106b16ffbe8459c339811537..1b49bc0b4e5400bb41061e366f7592bc42fc687e 100644
(file)
--- a/
guix.scm
+++ b/
guix.scm
@@
-120,8
+120,8
@@
(define gnunet-svn
(package
(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))
(source
(local-file %source-dir
#:recursive? #t))
@@
-143,6
+143,8
@@
("opus" ,opus)
("pulseaudio" ,pulseaudio)
("sqlite" ,sqlite)
("opus" ,opus)
("pulseaudio" ,pulseaudio)
("sqlite" ,sqlite)
+ ("postgresql" ,postgresql)
+ ("mysql" ,mysql)
("zlib" ,zlib)
("perl" ,perl)
("python" ,python) ; tests and gnunet-qr
("zlib" ,zlib)
("perl" ,perl)
("python" ,python) ; tests and gnunet-qr
@@
-151,6
+153,8
@@
("gmp" ,gmp)
("bluez" ,bluez) ; for optional bluetooth feature
("glib" ,glib)
("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
;;("texlive-minimal" ,texlive-minimal) ; optional.
("libogg" ,libogg)))
(native-inputs
@@
-163,6
+167,7
@@
`(#:configure-flags
(list (string-append "--with-nssdir=" %output "/lib")
"--enable-experimental")
`(#: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")
;;"--enable-gcc-hardening"
;;"--enable-linker-hardening"
;;"--enable-logging=verbose")