aboutsummaryrefslogtreecommitdiff
path: root/contrib/packages
diff options
context:
space:
mode:
authorng0 <ng0@infotropique.org>2017-10-13 20:57:27 +0000
committerng0 <ng0@infotropique.org>2017-10-13 20:57:27 +0000
commitc4f4d1e70e7c96f4222ce36a3f119286b978edbd (patch)
treea33affd90e98173fa9a0719830d82d777cfc4972 /contrib/packages
parent6107aebdf21a59834c3fe0eb6d3d664f1827c7bc (diff)
downloadgnunet-c4f4d1e70e7c96f4222ce36a3f119286b978edbd.tar.gz
gnunet-c4f4d1e70e7c96f4222ce36a3f119286b978edbd.zip
Adjustment in how contrib/packages/guix/gnunet.scm is being used.
Diffstat (limited to 'contrib/packages')
-rw-r--r--contrib/packages/guix/gnunet.scm13
1 files changed, 7 insertions, 6 deletions
diff --git a/contrib/packages/guix/gnunet.scm b/contrib/packages/guix/gnunet.scm
index a358fcecc..4ce0738c4 100644
--- a/contrib/packages/guix/gnunet.scm
+++ b/contrib/packages/guix/gnunet.scm
@@ -60,6 +60,7 @@
60 (gnu packages texinfo) 60 (gnu packages texinfo)
61 (gnu packages tex) 61 (gnu packages tex)
62 (gnu packages tls) 62 (gnu packages tls)
63 (gnu packages upnp)
63 (gnu packages video) 64 (gnu packages video)
64 (gnu packages web) 65 (gnu packages web)
65 (gnu packages xiph) 66 (gnu packages xiph)
@@ -91,7 +92,7 @@
91 ("gnurl" ,gnurl) 92 ("gnurl" ,gnurl)
92 ("gstreamer" ,gstreamer) 93 ("gstreamer" ,gstreamer)
93 ("gst-plugins-base" ,gst-plugins-base) 94 ("gst-plugins-base" ,gst-plugins-base)
94 ("gnutls" ,gnutls) ;Change to gnutls/dane once it is merged. 95 ("gnutls/dane" ,gnutls/dane) ;Change to gnutls/dane once it is merged.
95 ("libextractor" ,libextractor) 96 ("libextractor" ,libextractor)
96 ("libgcrypt" ,libgcrypt) 97 ("libgcrypt" ,libgcrypt)
97 ("libidn" ,libidn) 98 ("libidn" ,libidn)
@@ -113,10 +114,10 @@
113 ("gmp" ,gmp) 114 ("gmp" ,gmp)
114 ("bluez" ,bluez) ; for optional bluetooth feature 115 ("bluez" ,bluez) ; for optional bluetooth feature
115 ("glib" ,glib) 116 ("glib" ,glib)
116 ;; There are currently no binary substitutes for texlive on 117 ;; TODO: figure out the right texlive parts.
117 ;; hydra.gnu.org or its mirrors due to its size. Uncomment if you need it. 118 ;;("texlive-minimal" ,texlive-minimal)
118 ;;("texlive-minimal" ,texlive-minimal) ; optional.
119 ("texlive" ,texlive) 119 ("texlive" ,texlive)
120 ("miniupnpc" ,miniupnpc)
120 ("libogg" ,libogg))) 121 ("libogg" ,libogg)))
121 (native-inputs 122 (native-inputs
122 `(("pkg-config" ,pkg-config) 123 `(("pkg-config" ,pkg-config)
@@ -129,8 +130,8 @@
129 (arguments 130 (arguments
130 `(#:configure-flags 131 `(#:configure-flags
131 (list (string-append "--with-nssdir=" %output "/lib") 132 (list (string-append "--with-nssdir=" %output "/lib")
132 "--enable-gcc-hardening" 133 ;;"--enable-gcc-hardening"
133 "--enable-linker-hardening" 134 ;;"--enable-linker-hardening"
134 "--enable-logging=verbose" 135 "--enable-logging=verbose"
135 "CFLAGS=-ggdb -O0") 136 "CFLAGS=-ggdb -O0")
136 #:phases 137 #:phases