aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-02-22 00:34:49 +0100
committerLudovic Courtès <ludo@gnu.org>2014-02-22 00:34:49 +0100
commit17919a58012c38052133ed029450fdb98d01fb5c (patch)
tree525bb5af3e77fd69c24123e748df82916209754e /gnu
parentb2bfa32d253337a48f3bc0260982cbb945b345a3 (diff)
downloadguix-17919a58012c38052133ed029450fdb98d01fb5c.tar
guix-17919a58012c38052133ed029450fdb98d01fb5c.tar.gz
build-system/gnu: Allow the source to be a directory.
* guix/build/gnu-build-system.scm (unpack): Check if SOURCE is a directory, and copy it locally if it is. * gnu/packages/libwebsockets.scm (libwebsockets)[arguments]: Remove 'unpack' phase.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/libwebsockets.scm22
1 files changed, 6 insertions, 16 deletions
diff --git a/gnu/packages/libwebsockets.scm b/gnu/packages/libwebsockets.scm
index 3f900aef72..65aa174355 100644
--- a/gnu/packages/libwebsockets.scm
+++ b/gnu/packages/libwebsockets.scm
@@ -50,22 +50,12 @@
(build-system gnu-build-system)
(arguments
- '(#:phases (alist-replace
- 'unpack
- ;; FIXME: Remove this when gnu-build-system handles that
- ;; case correctly.
- (lambda* (#:key source #:allow-other-keys)
- (mkdir "source")
- (chdir "source")
- (copy-recursively source ".")
- #t)
-
- (alist-cons-before
- 'configure 'bootstrap
- (lambda _
- (chmod "libwebsockets-api-doc.html" #o666)
- (zero? (system* "./autogen.sh")))
- %standard-phases))))
+ '(#:phases (alist-cons-before
+ 'configure 'bootstrap
+ (lambda _
+ (chmod "libwebsockets-api-doc.html" #o666)
+ (zero? (system* "./autogen.sh")))
+ %standard-phases)))
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool "bin")