diff options
-rw-r--r-- | guix-env.scm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/guix-env.scm b/guix-env.scm index 8da3eff2c..67fe661b5 100644 --- a/guix-env.scm +++ b/guix-env.scm | |||
@@ -104,8 +104,6 @@ | |||
104 | 104 | ||
105 | (define %source-dir (dirname (current-filename))) | 105 | (define %source-dir (dirname (current-filename))) |
106 | 106 | ||
107 | ;; This will be needed when gnunet source moves to git. | ||
108 | ;; Taken from https://gitlab.com/dustyweb/pubstrate/blob/master/guix.scm | ||
109 | (define git-file? | 107 | (define git-file? |
110 | (let* ((pipe (with-directory-excursion %source-dir | 108 | (let* ((pipe (with-directory-excursion %source-dir |
111 | (open-pipe* OPEN_READ "git" "ls-files"))) | 109 | (open-pipe* OPEN_READ "git" "ls-files"))) |
@@ -123,14 +121,14 @@ | |||
123 | (any (cut string-suffix? <> file) files)) | 121 | (any (cut string-suffix? <> file) files)) |
124 | (_ #f))))) | 122 | (_ #f))))) |
125 | 123 | ||
126 | (define gnunet-svn | 124 | (define gnunet-git |
127 | (package | 125 | (package |
128 | (name "gnunet-svn") | 126 | (name "gnunet-git") |
129 | (version (string-append "0.10.1-" "dev")) | 127 | (version (string-append "0.10.1-" "dev")) |
130 | (source | 128 | (source |
131 | (local-file %source-dir | 129 | (local-file %source-dir |
132 | #:recursive? #t)) | 130 | #:recursive? #t)) |
133 | ;;#:select? git-file?)) | 131 | ;;#:select? git-file?)) ; XXX: FIXME. |
134 | (build-system gnu-build-system) | 132 | (build-system gnu-build-system) |
135 | (inputs | 133 | (inputs |
136 | `(("glpk" ,glpk) | 134 | `(("glpk" ,glpk) |
@@ -176,7 +174,7 @@ | |||
176 | (list (string-append "--with-nssdir=" %output "/lib") | 174 | (list (string-append "--with-nssdir=" %output "/lib") |
177 | "--enable-experimental" | 175 | "--enable-experimental" |
178 | ;; These appear to be "broken" on Guix, needs debugging. | 176 | ;; These appear to be "broken" on Guix, needs debugging. |
179 | ;;"--enable-gcc-hardening" | 177 | "--enable-gcc-hardening" |
180 | "--enable-linker-hardening" | 178 | "--enable-linker-hardening" |
181 | "--enable-logging=verbose" | 179 | "--enable-logging=verbose" |
182 | "--enable-poisoning" | 180 | "--enable-poisoning" |
@@ -217,4 +215,4 @@ kinds of basic applications for the foundation of a GNU internet.") | |||
217 | (license license:gpl3+) | 215 | (license license:gpl3+) |
218 | (home-page "https://gnunet.org/"))) | 216 | (home-page "https://gnunet.org/"))) |
219 | 217 | ||
220 | gnunet-svn | 218 | gnunet-git |