me/guix
Archived
1
0
Fork 0
Code Activity

gnu: make-autoconf-wrapper: Remove input labels.

Browse source 
* gnu/packages/autotools.scm (make-autoconf-wrapper)[inputs]: Remove labels.
[arguments]: Use G-expression and SEARCH-INPUT-FILE.
This commit is contained in:
Marius Bakke 2022-07-17 00:00:48 +02:00
parent 8fa17cb6d5
commit 9e4b3391c5
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 47 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gnu/packages/autotools.scm
View file

@ -205,31 +205,27 @@ know anything about Autoconf or M4.")
use our own Bash instead of /bin/sh in shebangs. For that reason, it should use our own Bash instead of /bin/sh in shebangs. For that reason, it should
only be used internally---users should not end up distributing `configure' only be used internally---users should not end up distributing `configure'
files with a system-specific shebang." files with a system-specific shebang."
(package (inherit autoconf) (package
(inherit autoconf)
(name (string-append (package-name autoconf) "-wrapper")) (name (string-append (package-name autoconf) "-wrapper"))
(build-system trivial-build-system) (build-system trivial-build-system)
(inputs `(("guile" (inputs
(list
;; XXX: Kludge to hide the circular dependency. ;; XXX: Kludge to hide the circular dependency.
,(module-ref (resolve-interface '(gnu packages guile)) (module-ref (resolve-interface '(gnu packages guile))
'guile-3.0/fixed)) 'guile-3.0/fixed)
("autoconf" ,autoconf) autoconf
("bash" ,bash-minimal))) bash-minimal))
(arguments (arguments
'(#:modules ((guix build utils)) (list
#:modules '((guix build utils))
#:builder #:builder
(begin #~(begin
(use-modules (guix build utils)) (use-modules (guix build utils))
(let* ((out (assoc-ref %outputs "out")) (let ((bin (string-append #$output "/bin"))
(bin (string-append out "/bin")) (autoconf (search-input-file %build-inputs "/bin/autoconf"))
(autoconf (string-append (guile (search-input-file %build-inputs "/bin/guile"))
(assoc-ref %build-inputs "autoconf") (sh (search-input-file %build-inputs "/bin/sh"))
"/bin/autoconf"))
(guile (string-append
(assoc-ref %build-inputs "guile")
"/bin/guile"))
(sh (string-append
(assoc-ref %build-inputs "bash")
"/bin/sh"))
(modules ((compose dirname dirname dirname) (modules ((compose dirname dirname dirname)
(search-path %load-path (search-path %load-path
"guix/build/utils.scm")))) "guix/build/utils.scm"))))
@ -267,8 +263,7 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
(patch-shebang "configure")) (patch-shebang "configure"))
(exit (status:exit-val result)))) (exit (status:exit-val result))))
port))) port)))
(chmod (string-append bin "/autoconf") #o555) (chmod (string-append bin "/autoconf") #o555)))))
#t))))
;; Do not show it in the UI since it's meant for internal use. ;; Do not show it in the UI since it's meant for internal use.
(properties '((hidden? . #t))))) (properties '((hidden? . #t)))))