mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

maint: Avoid 'specification->package' when referring to packages.

Browse source 
This avoids ambiguity when using channels in addition to 'guix'.

* build-aux/guix/guile-package.scm (guile): Refer to packages by their
bindings rather than using 'specification->package'.
This commit is contained in:
Ludovic Courtès 2023-06-05 09:10:05 +02:00
parent 36fd2b4920
commit 7847683d05
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 37 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

59
build-aux/guix/guile-package.scm
View file

@ -39,15 +39,28 @@
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages) #:use-module (gnu packages autotools)
#:use-module (gnu packages pkg-config)) #:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages compression)
#:use-module (gnu packages flex)
#:use-module (gnu packages gdb)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gperf)
#:use-module (gnu packages libffi)
#:use-module (gnu packages libunistring)
#:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages readline)
#:use-module (gnu packages tex)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages version-control))
(define-public guile (define-public guile
(let ((vcs-file? (or (git-predicate (let ((vcs-file? (or (git-predicate
(string-append (current-source-directory) (string-append (current-source-directory)
"/../..")) "/../.."))
(const #t))) (const #t))))
(S specification->package))
(package (package
(name "guile") (name "guile")
(version "3.0.99-git") (version "3.0.99-git")
@ -92,23 +105,23 @@
(or bash "/bin/sh"))))))))) (or bash "/bin/sh")))))))))
(native-inputs (native-inputs
(append (map S '("autoconf" (append (list autoconf
"automake" automake
"libtool" libtool
"gettext" gnu-gettext
"flex" flex
"texinfo" texinfo
"texlive-base" ;for "make pdf" texlive-base ;for "make pdf"
"texlive-epsf" texlive-epsf
"gperf" gperf
"git" git
"gdb" gdb
"strace" strace
"readline" readline
"lzip")) lzip
;; Ensure we get a cross-pkg-config when needed. ;; Ensure we get a cross-pkg-config when needed.
(list pkg-config) pkg-config)
;; When cross-compiling, a native version of Guile itself ;; When cross-compiling, a native version of Guile itself
;; is needed. ;; is needed.
@ -116,16 +129,16 @@
(list this-package) (list this-package)
'()))) '())))
(inputs (inputs
(append (list (S "libffi")) (append (list libffi)
;; We need Bash when cross-compiling because some of the ;; We need Bash when cross-compiling because some of the
;; scripts in bin/ refer to it. Use 'bash-minimal' because ;; scripts in bin/ refer to it. Use 'bash-minimal' because
;; we don't need an interactive Bash with Readline and all. ;; we don't need an interactive Bash with Readline and all.
(if (target-mingw?) (if (target-mingw?)
(list (S "libiconv")) (list libiconv)
(list (S "bash-minimal"))))) (list bash-minimal))))
(propagated-inputs (propagated-inputs
(map S '("libunistring" "libgc"))) (list libunistring libgc))
(outputs '("out" "debug")) (outputs '("out" "debug"))