diff options
author | ng0 <contact.ng0@cryptolab.net> | 2017-06-01 19:48:20 +0000 |
---|---|---|
committer | ng0 <contact.ng0@cryptolab.net> | 2017-06-01 19:48:20 +0000 |
commit | 82068a5eb95bbe39e244f155567f39953c2b5fb9 (patch) | |
tree | e2de9478387c38db5cc5fe341306ff4069aa85db /guix-env.scm | |
parent | 1defd30dfeb1867c2756b3fe6a437f695951d0c9 (diff) | |
download | gnunet-82068a5eb95bbe39e244f155567f39953c2b5fb9.tar.gz gnunet-82068a5eb95bbe39e244f155567f39953c2b5fb9.zip |
guix-env: some update.
Diffstat (limited to 'guix-env.scm')
-rw-r--r-- | guix-env.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/guix-env.scm b/guix-env.scm index fc3d5a231..ec3a8e1f8 100644 --- a/guix-env.scm +++ b/guix-env.scm | |||
@@ -35,7 +35,8 @@ | |||
35 | ;; guix build -f guix-env.scm | 35 | ;; guix build -f guix-env.scm |
36 | ;; | 36 | ;; |
37 | ;; We'd like to provide advanced functions such as guix environment specific | 37 | ;; We'd like to provide advanced functions such as guix environment specific |
38 | ;; gnunet-svn package, but this is subject to tests right now. | 38 | ;; gnunet-git package and usage of gnunet-gtk-git, but this is subject |
39 | ;; to tests right now. | ||
39 | ;; | 40 | ;; |
40 | ;; Further versions of GNUnet for Guix can currently be found in | 41 | ;; Further versions of GNUnet for Guix can currently be found in |
41 | ;; https://git.pragmatique.xyz/ng0-packages/log.html, mirrored at | 42 | ;; https://git.pragmatique.xyz/ng0-packages/log.html, mirrored at |
@@ -49,6 +50,7 @@ | |||
49 | (guix build-system gnu) | 50 | (guix build-system gnu) |
50 | (guix gexp) | 51 | (guix gexp) |
51 | ((guix build utils) #:select (with-directory-excursion)) | 52 | ((guix build utils) #:select (with-directory-excursion)) |
53 | (guix git-download) | ||
52 | (gnu packages) | 54 | (gnu packages) |
53 | (gnu packages aidc) | 55 | (gnu packages aidc) |
54 | (gnu packages autotools) | 56 | (gnu packages autotools) |
@@ -94,7 +96,8 @@ | |||
94 | (version (string-append "0.10.1-" "dev")) | 96 | (version (string-append "0.10.1-" "dev")) |
95 | (source | 97 | (source |
96 | (local-file %source-dir | 98 | (local-file %source-dir |
97 | #:recursive? #t)) | 99 | #:recursive? #t |
100 | #:select? (git-predicate %source-dir))) | ||
98 | (build-system gnu-build-system) | 101 | (build-system gnu-build-system) |
99 | (inputs | 102 | (inputs |
100 | `(("glpk" ,glpk) | 103 | `(("glpk" ,glpk) |
@@ -138,7 +141,6 @@ | |||
138 | (arguments | 141 | (arguments |
139 | `(#:configure-flags | 142 | `(#:configure-flags |
140 | (list (string-append "--with-nssdir=" %output "/lib") | 143 | (list (string-append "--with-nssdir=" %output "/lib") |
141 | ;; These appear to be "broken" on Guix, needs debugging. | ||
142 | "--enable-gcc-hardening" | 144 | "--enable-gcc-hardening" |
143 | "--enable-linker-hardening" | 145 | "--enable-linker-hardening" |
144 | 146 | ||