amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: artanis: Remove hard-coded guile effective version.

Browse source 
* gnu/packages/guile-xyz.scm (artanis)[arguments]: Import
target-guile-effective-version from (guix build guile-build-system). Use
target-guile-effective-version to determine the guile effective version.
This commit is contained in:
Arun Isaac 2021-08-25 01:22:42 +05:30
parent 0e801db11e
commit e265ca6414
No known key found for this signature in database
GPG key ID: 2E25EE8B61802BB3
1 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/guile-xyz.scm
View file

@ -17,7 +17,7 @@
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2018, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018, 2019, 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018, 2019, 2020, 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 swedebugia <swedebugia@riseup.net> ;;; Copyright © 2019 swedebugia <swedebugia@riseup.net>
@ -182,11 +182,20 @@
("pkgconfig" ,pkg-config) ("pkgconfig" ,pkg-config)
("util-linux" ,util-linux))) ;for the `script' command ("util-linux" ,util-linux))) ;for the `script' command
(arguments (arguments
'(#:make-flags `(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
,@%gnu-build-system-modules)
#:imported-modules ((guix build guile-build-system)
,@%gnu-build-system-modules)
#:make-flags
;; TODO: The documentation must be built with the `docs' target. ;; TODO: The documentation must be built with the `docs' target.
(let* ((out (assoc-ref %outputs "out")) (let* ((out (assoc-ref %outputs "out"))
(scm (string-append out "/share/guile/site/2.2")) ;; We pass guile explicitly here since this executes before the
(go (string-append out "/lib/guile/2.2/site-ccache"))) ;; set-paths phase and therefore guile is not yet in PATH.
(effective-version (target-guile-effective-version
(assoc-ref %build-inputs "guile")))
(scm (string-append out "/share/guile/site/" effective-version))
(go (string-append out "/lib/guile/" effective-version "/site-ccache")))
;; Don't use (%site-dir) for site paths. ;; Don't use (%site-dir) for site paths.
(list (string-append "MOD_PATH=" scm) (list (string-append "MOD_PATH=" scm)
(string-append "MOD_COMPILED_PATH=" go))) (string-append "MOD_COMPILED_PATH=" go)))
@ -199,7 +208,9 @@
(("\\(%site-dir\\)") (("\\(%site-dir\\)")
(string-append "\"" (string-append "\""
(assoc-ref outputs "out") (assoc-ref outputs "out")
"/share/guile/site/2.2\""))))) "/share/guile/site/"
(target-guile-effective-version)
"\"")))))
(add-after 'unpack 'patch-reference-to-libnss (add-after 'unpack 'patch-reference-to-libnss
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "artanis/security/nss.scm" (substitute* "artanis/security/nss.scm"
@ -221,9 +232,11 @@
(add-after 'install 'wrap-art (add-after 'install 'wrap-art
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(effective-version (target-guile-effective-version))
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(scm (string-append out "/share/guile/site/2.2")) (scm (string-append out "/share/guile/site/" effective-version))
(go (string-append out "/lib/guile/2.2/site-ccache"))) (go (string-append out "/lib/guile/" effective-version
"/site-ccache")))
(wrap-program (string-append bin "/art") (wrap-program (string-append bin "/art")
`("GUILE_LOAD_PATH" ":" prefix `("GUILE_LOAD_PATH" ":" prefix
(,scm ,(getenv "GUILE_LOAD_PATH"))) (,scm ,(getenv "GUILE_LOAD_PATH")))