;;; mudsync --- Live hackable MUDs in Guile
;;; Copyright (C) 2016 Jan Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright (C) 2017 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright (C) 2017 Christine Lemmer-Webber <cwebber@dustycloud.org>
;;;
;;; This program is free software: you can redistribute it and/or modify
;;; it under the terms of the GNU General Public License as published by
(gnu packages)
(gnu packages autotools)
(gnu packages guile)
+ (gnu packages guile-xyz)
(gnu packages pkg-config)
(gnu packages texinfo))
(define %source-dir (dirname (current-filename)))
-(define guile-without-select-bug
- (package
- (inherit guile-next)
- (version (package-version guile-next))
- (source (origin
- (method url-fetch)
- (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-"
- version ".tar.xz"))
- (sha256
- (base32
- "0r9y4hw17dlxahik4zsccfb2f3p2a07wqndfm251bgmam9hln6gi"))
- (modules '((guix build utils)))
-
- ;; Remove the pre-built object files. Instead, build everything
- ;; from source, at the expense of significantly longer build
- ;; times (almost 3 hours on a 4-core Intel i5).
- (snippet '(for-each delete-file
- (find-files "prebuilt" "\\.go$")))
-
- ;; Here's what we're adding
- (patches (list (string-append %source-dir
- "/build-aux/patch-guile-fix-live-repl.patch")))))))
-
(package
(name "guile-mudsync")
(version "git")
(build-system gnu-build-system)
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
- ("guile" ,guile-without-select-bug)
- ("guile-8sync" ,guile-8sync)
- ("guile-irregex" ,guile2.2-irregex)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
+ (inputs `(("guile" ,guile-3.0)
+ ("guile-8sync" ,guile-8sync)
+ ("guile-irregex" ,guile-irregex)))
(arguments
`(#:phases (modify-phases %standard-phases
(add-before 'configure 'bootstrap