diff options
| author | ng0 <ng0@infotropique.org> | 2017-09-10 17:26:01 +0000 |
|---|---|---|
| committer | ng0 <ng0@infotropique.org> | 2017-09-10 17:26:01 +0000 |
| commit | 207d8bbd2b0d402d4ea620cc8ffd3c8b80e59fc4 (patch) | |
| tree | 8cad7eaa9c4c0ecfc0372cc04b8e38e864643b94 /contrib | |
| parent | e475309e41e4734e5ad6a687c985599036868135 (diff) | |
contrib: guix changes.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/packages/guix/guix-env.scm | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/contrib/packages/guix/guix-env.scm b/contrib/packages/guix/guix-env.scm index cf7ccb85a2..6946fee570 100644 --- a/contrib/packages/guix/guix-env.scm +++ b/contrib/packages/guix/guix-env.scm @@ -81,6 +81,7 @@ (gnu packages python) (gnu packages tex) (gnu packages texinfo) + (gnu packages tex) (gnu packages tls) (gnu packages video) (gnu packages web) @@ -91,7 +92,7 @@ "/../../../")) (define gnunet-git - (let* ((revision "2") + (let* ((revision "3") (select? (delay (or (git-predicate (string-append (current-source-directory) "/../../../")) @@ -131,12 +132,14 @@ ("python" ,python) ; tests and gnunet-qr ("jansson" ,jansson) ("nss" ,nss) + ("glib" ,glib "bin") ("gmp" ,gmp) ("bluez" ,bluez) ; for optional bluetooth feature ("glib" ,glib) ;; There are currently no binary substitutes for texlive on ;; hydra.gnu.org or its mirrors due to its size. Uncomment if you need it. ;;("texlive-minimal" ,texlive-minimal) ; optional. + ("texlive" ,texlive) ("libogg" ,libogg))) (native-inputs `(("pkg-config" ,pkg-config) @@ -150,7 +153,7 @@ (outputs '("out" "debug")) (arguments `(#:configure-flags - (list (string-append "--with-nssdir=" %output "/lib") + (list (string-append "--with-nssdir=" %output "/lib");"/lib/gnunet/nss") "--enable-gcc-hardening" "--enable-linker-hardening" @@ -174,6 +177,14 @@ (add-after 'patch-bin-sh 'bootstrap (lambda _ (zero? (system* "sh" "bootstrap")))) + ;; (add-after 'install 'install-lib-nss + ;; (lambda* (#:key outputs #:allow-other-keys) + ;; (let* ((out (assoc-ref outputs "out")) + ;; (lib (string-append out "/lib/nss/"))) + ;; (mkdir-p lib) + ;; (copy-recursively "src/gns/nss/" lib) + ;; (install-file "ping" "combobreak")) + ;; #t)) (delete 'check)))) ;; XXX: https://gnunet.org/bugs/view.php?id=4619 ;; (add-after 'install 'set-path-for-check |