ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 06:42:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guile-xcb: Always use the input Guile's effective version.

Browse source 
* gnu/packages/guile-wm.scm (guile-xcb)[arguments]: Replace hard-coded
version number with that of the "guile" input.
This commit is contained in:
Tobias Geerinckx-Rice 2022-05-22 02:00:06 +02:00
parent b4caea953a
commit 00b6a808b7
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/guile-wm.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -30,7 +31,8 @@ (define-module (gnu packages guile-wm)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu))
#:use-module (guix build-system gnu)
#:use-module (guix utils))
(define-public guile-xcb
(let ((commit "db7d5a393cc37a56f66541b3f33938b40c6f35b3")
@ -48,16 +50,17 @@ (define-public guile-xcb
(base32
"16w4vgzbmnwih4bgfn8rw85ryfvzhc6hyly6bic9sd7hhc82rcnd"))))
(build-system gnu-build-system)
(arguments '(;; Parallel builds fail.
#:parallel-build? #f
#:configure-flags (list (string-append
"--with-guile-site-dir="
(assoc-ref %outputs "out")
"/share/guile/site/2.2")
(string-append
"--with-guile-site-ccache-dir="
(assoc-ref %outputs "out")
"/lib/guile/2.2/site-ccache"))))
(arguments
`( ;; Parallel builds fail.
#:parallel-build? #f
#:configure-flags
(let ((out (assoc-ref %outputs "out"))
(effective ,(version-major+minor
(package-version (this-package-input "guile")))))
(list (string-append "--with-guile-site-dir=" out
"/share/guile/site/" effective)
(string-append "--with-guile-site-ccache-dir=" out
"/lib/guile/" effective "/site-ccache")))))
(native-inputs (list guile-2.2 pkg-config texinfo))
(inputs `(("guile" ,guile-2.2)
("xcb" ,xcb-proto)))