aboutsummaryrefslogtreecommitdiff
path: root/contrib/packages
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/packages')
-rw-r--r--contrib/packages/guix/guix-env.scm15
1 files changed, 13 insertions, 2 deletions
diff --git a/contrib/packages/guix/guix-env.scm b/contrib/packages/guix/guix-env.scm
index cf7ccb85a..6946fee57 100644
--- a/contrib/packages/guix/guix-env.scm
+++ b/contrib/packages/guix/guix-env.scm
@@ -81,6 +81,7 @@
81 (gnu packages python) 81 (gnu packages python)
82 (gnu packages tex) 82 (gnu packages tex)
83 (gnu packages texinfo) 83 (gnu packages texinfo)
84 (gnu packages tex)
84 (gnu packages tls) 85 (gnu packages tls)
85 (gnu packages video) 86 (gnu packages video)
86 (gnu packages web) 87 (gnu packages web)
@@ -91,7 +92,7 @@
91 "/../../../")) 92 "/../../../"))
92 93
93(define gnunet-git 94(define gnunet-git
94 (let* ((revision "2") 95 (let* ((revision "3")
95 (select? (delay (or (git-predicate 96 (select? (delay (or (git-predicate
96 (string-append (current-source-directory) 97 (string-append (current-source-directory)
97 "/../../../")) 98 "/../../../"))
@@ -131,12 +132,14 @@
131 ("python" ,python) ; tests and gnunet-qr 132 ("python" ,python) ; tests and gnunet-qr
132 ("jansson" ,jansson) 133 ("jansson" ,jansson)
133 ("nss" ,nss) 134 ("nss" ,nss)
135 ("glib" ,glib "bin")
134 ("gmp" ,gmp) 136 ("gmp" ,gmp)
135 ("bluez" ,bluez) ; for optional bluetooth feature 137 ("bluez" ,bluez) ; for optional bluetooth feature
136 ("glib" ,glib) 138 ("glib" ,glib)
137 ;; There are currently no binary substitutes for texlive on 139 ;; There are currently no binary substitutes for texlive on
138 ;; hydra.gnu.org or its mirrors due to its size. Uncomment if you need it. 140 ;; hydra.gnu.org or its mirrors due to its size. Uncomment if you need it.
139 ;;("texlive-minimal" ,texlive-minimal) ; optional. 141 ;;("texlive-minimal" ,texlive-minimal) ; optional.
142 ("texlive" ,texlive)
140 ("libogg" ,libogg))) 143 ("libogg" ,libogg)))
141 (native-inputs 144 (native-inputs
142 `(("pkg-config" ,pkg-config) 145 `(("pkg-config" ,pkg-config)
@@ -150,7 +153,7 @@
150 (outputs '("out" "debug")) 153 (outputs '("out" "debug"))
151 (arguments 154 (arguments
152 `(#:configure-flags 155 `(#:configure-flags
153 (list (string-append "--with-nssdir=" %output "/lib") 156 (list (string-append "--with-nssdir=" %output "/lib");"/lib/gnunet/nss")
154 "--enable-gcc-hardening" 157 "--enable-gcc-hardening"
155 "--enable-linker-hardening" 158 "--enable-linker-hardening"
156 159
@@ -174,6 +177,14 @@
174 (add-after 'patch-bin-sh 'bootstrap 177 (add-after 'patch-bin-sh 'bootstrap
175 (lambda _ 178 (lambda _
176 (zero? (system* "sh" "bootstrap")))) 179 (zero? (system* "sh" "bootstrap"))))
180 ;; (add-after 'install 'install-lib-nss
181 ;; (lambda* (#:key outputs #:allow-other-keys)
182 ;; (let* ((out (assoc-ref outputs "out"))
183 ;; (lib (string-append out "/lib/nss/")))
184 ;; (mkdir-p lib)
185 ;; (copy-recursively "src/gns/nss/" lib)
186 ;; (install-file "ping" "combobreak"))
187 ;; #t))
177 (delete 'check)))) 188 (delete 'check))))
178 ;; XXX: https://gnunet.org/bugs/view.php?id=4619 189 ;; XXX: https://gnunet.org/bugs/view.php?id=4619
179 ;; (add-after 'install 'set-path-for-check 190 ;; (add-after 'install 'set-path-for-check