aboutsummaryrefslogtreecommitdiff
path: root/contrib/packages
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/packages')
-rw-r--r--contrib/packages/guix/guix-env.scm21
1 files changed, 16 insertions, 5 deletions
diff --git a/contrib/packages/guix/guix-env.scm b/contrib/packages/guix/guix-env.scm
index 9631abd7c..cf7ccb85a 100644
--- a/contrib/packages/guix/guix-env.scm
+++ b/contrib/packages/guix/guix-env.scm
@@ -48,6 +48,7 @@
48 (guix gexp) 48 (guix gexp)
49 ((guix build utils) #:select (with-directory-excursion)) 49 ((guix build utils) #:select (with-directory-excursion))
50 (guix git-download) 50 (guix git-download)
51 (guix utils) ; current-source-directory
51 (gnu packages) 52 (gnu packages)
52 (gnu packages aidc) 53 (gnu packages aidc)
53 (gnu packages autotools) 54 (gnu packages autotools)
@@ -86,23 +87,33 @@
86 (gnu packages xiph) 87 (gnu packages xiph)
87 ((guix licenses) #:prefix license:)) 88 ((guix licenses) #:prefix license:))
88 89
89(define %source-dir (canonicalize-path "../../../")) 90(define %source-dir (string-append (current-source-directory)
91 "/../../../"))
90 92
91(define gnunet-git 93(define gnunet-git
92 (let* ((revision "1")) 94 (let* ((revision "2")
93 (package 95 (select? (delay (or (git-predicate
96 (string-append (current-source-directory)
97 "/../../../"))
98 source-file?))))
99 (package
94 (name "gnunet-git") 100 (name "gnunet-git")
95 (version (string-append "0.10.1-" revision "." "dev")) 101 (version (string-append "0.10.1-" revision "." "dev"))
96 (source 102 (source
97 (local-file %source-dir 103 (local-file ;;"../../.."
104 ;;%source-dir
105 ;;(string-append (getcwd) "/../../../")
106 (string-append (getcwd)) ;drrty hack and this assumes one static position FIXME!
98 #:recursive? #t)) 107 #:recursive? #t))
108 ;;#:select? (git-predicate %source-dir)))
109 ;;#:select? (force select?)))
99 (build-system gnu-build-system) 110 (build-system gnu-build-system)
100 (inputs 111 (inputs
101 `(("glpk" ,glpk) 112 `(("glpk" ,glpk)
102 ("gnurl" ,gnurl) 113 ("gnurl" ,gnurl)
103 ("gstreamer" ,gstreamer) 114 ("gstreamer" ,gstreamer)
104 ("gst-plugins-base" ,gst-plugins-base) 115 ("gst-plugins-base" ,gst-plugins-base)
105 ("gnutls" ,gnutls) 116 ("gnutls" ,gnutls) ;Change to gnutls/dane once it is merged.
106 ("libextractor" ,libextractor) 117 ("libextractor" ,libextractor)
107 ("libgcrypt" ,libgcrypt) 118 ("libgcrypt" ,libgcrypt)
108 ("libidn" ,libidn) 119 ("libidn" ,libidn)