From 1764c35e55932b376fc4d537fccf4385a41fdcfa Mon Sep 17 00:00:00 2001 From: David Thompson Date: Tue, 4 May 2021 17:14:09 -0400 Subject: guix: Make package compatible with `guix build -f`. --- guix.scm | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/guix.scm b/guix.scm index 04dfb1e..7df938b 100644 --- a/guix.scm +++ b/guix.scm @@ -37,6 +37,7 @@ (srfi srfi-1) (guix build-system gnu) (guix download) + (guix gexp) (guix git-download) ((guix licenses) #:prefix license:) (guix packages) @@ -57,12 +58,17 @@ (define target-guile (package - (inherit guile-3.0-latest) - (source (origin - (inherit (package-source guile-3.0-latest)) - (patches (list "0001-goops-Preserve-all-slot-options-in-redefinable-class.patch")))) - (arguments - `(#:tests? #f ,@(package-arguments guile-3.0-latest))))) + (inherit guile-3.0-latest) + (version "3.0.6") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/guile/guile-" + version ".tar.xz")) + (sha256 + (base32 + "0a2xhjy6y5p15qvc59pdnzi20fm1jwqa772pwxb16wkx0z187gg2")))) + (arguments + `(#:tests? #f ,@(package-arguments guile-3.0-latest))))) (define guile3.0-opengl (package @@ -174,11 +180,22 @@ Scheme. It contains all of the basic components needed to develop (home-page "https://dthompson.us/projects/chickadee.html") (license license:gpl3+)))) +(define %source-dir (dirname (current-filename))) + (package (name "starling") (version "0.1") - (source #f) + (source (local-file %source-dir + #:recursive? #t + #:select? (git-predicate %source-dir))) (build-system gnu-build-system) + (arguments + '(#:make-flags '("GUILE_AUTO_COMPILE=0") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ + (invoke "sh" "bootstrap")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3