;;; Copyright (C) 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright (C) 2017 Christopher Allan Webber <cwebber@dustycloud.org>
;;;
-;;; Also borrowing code from:
-;;; guile-sdl2 --- FFI bindings for SDL2
-;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;;
;;; This file is part of 8sync.
;;; However, unlike most of 8sync, which is under the LGPLv3+, this
;;; file in particular is licensed under GPLv3+.
((guix build utils) #:select (with-directory-excursion))
(gnu packages)
(gnu packages autotools)
+ (gnu packages gettext)
(gnu packages guile)
(gnu packages pkg-config)
(gnu packages texinfo))
(define %source-dir (dirname (current-filename)))
-(define git-file?
- (let* ((pipe (with-directory-excursion %source-dir
- (open-pipe* OPEN_READ "git" "ls-files")))
- (files (let loop ((lines '()))
- (match (read-line pipe)
- ((? eof-object?)
- (reverse lines))
- (line
- (loop (cons line lines))))))
- (status (close-pipe pipe)))
- (lambda (file stat)
- (match (stat:type stat)
- ('directory #t)
- ((or 'regular 'symlink)
- (any (cut string-suffix? <> file) files))
- (_ #f)))))
+(define guile-fibers-git
+ (package
+ (inherit guile-fibers)
+ (name "guile-fibers")
+ (version "git")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/wingo/fibers.git")
+ (commit "0fa1fd6adf9980229a46956503a6bf36e8154a78")))
+ (sha256
+ (base32
+ "0a782aa0v2d115427h1h57jkxy04axklan60dzgnsry4axw9iq8r"))))
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-before 'configure 'bootstrap
+ (lambda _
+ (zero? (system* "./autogen.sh"))))
+ (add-before 'configure 'setenv
+ (lambda _
+ (setenv "GUILE_AUTO_COMPILE" "0"))))
+ ;; We wouldn't want this in the upstream fibers package, but gosh
+ ;; running tests takes forever and is painful
+ #:tests? #f))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)
+ ("texinfo" ,texinfo)
+ ("gettext" ,gettext-minimal)
+ ,@(package-native-inputs guile-2.2)))))
(package
(name "guile-8sync")
(version "git")
- (source (local-file %source-dir #:recursive? #t #:select? git-file?))
+ (source (local-file %source-dir
+ #:recursive? #t
+ #:select? (git-predicate %source-dir)))
(build-system gnu-build-system)
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
- ("guile" ,guile-next)
+ ("guile" ,guile-2.2)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
+ (propagated-inputs `(("guile-fibers" ,guile-fibers-git)))
(arguments
`(#:phases (modify-phases %standard-phases
(add-before 'configure 'bootstrap