me/guix
Archived
1
0
Fork 0
Code Activity

gnu: Use 'search-input-file' some more.

Browse source 
This patch replaces occurrences of:

  (string-append (assoc-ref %build-inputs "…") "/…")

by:

  (search-input-file %build-inputs "/…")

* doc/guix.texi (Miscellaneous Services): Use 'search-input-file' in R
Shiny example.
* gnu/packages/admin.scm (screenfetch): Use 'search-input-file'.
(ufetch): Likewise.
(hosts): Likewise.
* gnu/packages/backup.scm (dirvish): Likewise.
* gnu/packages/code.scm (colormake): Likewise.
* gnu/packages/compression.scm (makeself-safeextract): Likewise.
* gnu/packages/debug.scm (scanmem): Likewise.
* gnu/packages/education.scm (snap): Likewise.
(omnitux): Likewise.
* gnu/packages/emacs-xyz.scm (epipe): Likewise.
* gnu/packages/games.scm (openttd-opensfx): Likewise.
(openttd-openmsx): Likewise.
(openrct2-title-sequences):  Likewise.
(openrct2-objects):  Likewise.
(mrrescue):  Likewise.
(0ad-data):  Likewise.
(xonotic-data):  Likewise.
(drascula):  Likewise.
(make-lure-package):  Likewise.
(make-queen-package):  Likewise.
(sky):  Likewise.
* gnu/packages/gnome.scm (network-manager): Likewise.
* gnu/packages/gnuzilla.scm (icedove): Likewise.
* gnu/packages/guile-xyz.scm (guile-shapefile): Likewise.
* gnu/packages/hurd.scm (netdde): Likewise.
* gnu/packages/javascript.scm (js-context-menu): Likewise.
(js-commander): Likewise.
(js-xmldom-sre): Likewise.
* gnu/packages/kde-frameworks.scm (krunner): Likewise.
* gnu/packages/kodi.scm (kodi-cli): Likewise.
* gnu/packages/libreoffice.scm (hunspell-dict-pl): Likewise.
* gnu/packages/linux.scm (e2fsck/static): Likewise.
* gnu/packages/markup.scm (markdown): Likewise.
* gnu/packages/maths.scm (hdf-java): Likewise.
* gnu/packages/multiprecision.scm (libtomcrypt): Likewise.
* gnu/packages/networking.scm (batctl): Likewise.
* gnu/packages/python-xyz.scm (python-pymediainfo): Likewise.
* gnu/packages/shells.scm (fish-foreign-env): Likewise.
* gnu/packages/tex.scm (texlive-fonts-iwona): Likewise.
* gnu/packages/upnp.scm (miniupnpc): Likewise.
* gnu/packages/version-control.scm (git-annex-remote-rclone): Likewise.
* gnu/packages/virtualization.scm (qemu): Likewise.
* gnu/packages/web.scm (icedtea-web): Likewise.
* gnu/packages/wm.scm (stumpish): Likewise.
This commit is contained in:
Ludovic Courtès 2021-10-23 22:53:12 +02:00
parent e5f21c7e38
commit 2dffe4767c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
30 changed files with 87 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/guix.texi
View file

@ -33078,8 +33078,7 @@ The common way to create this file is as follows:
(let* ((out (assoc-ref %outputs "out")) (let* ((out (assoc-ref %outputs "out"))
(targetdir (string-append out "/share/" ,name)) (targetdir (string-append out "/share/" ,name))
(app (string-append out "/bin/" ,name)) (app (string-append out "/bin/" ,name))
(Rbin (string-append (assoc-ref %build-inputs "r-min") (Rbin (search-input-file %build-inputs "/bin/Rscript")))
"/bin/Rscript")))
;; @dots{} ;; @dots{}
(mkdir-p (string-append out "/bin")) (mkdir-p (string-append out "/bin"))
(call-with-output-file app (call-with-output-file app

12
gnu/packages/admin.scm
View file

@ -3639,8 +3639,7 @@ you are running, what theme or icon set you are using, etc.")
(string-append out "/share/doc/" ,name "-" ,version)) (string-append out "/share/doc/" ,name "-" ,version))
(substitute* (string-append out "/bin/screenfetch") (substitute* (string-append out "/bin/screenfetch")
(("/usr/bin/env bash") (("/usr/bin/env bash")
(string-append (assoc-ref %build-inputs "bash") (search-input-file %build-inputs "/bin/bash")))
"/bin/bash")))
(wrap-program (wrap-program
(string-append out "/bin/screenfetch") (string-append out "/bin/screenfetch")
`("PATH" ":" prefix `("PATH" ":" prefix
@ -3650,8 +3649,9 @@ you are running, what theme or icon set you are using, etc.")
(assoc-ref %build-inputs "xprop") "/bin")))) (assoc-ref %build-inputs "xprop") "/bin"))))
(substitute* (string-append out "/bin/screenfetch") (substitute* (string-append out "/bin/screenfetch")
(("#!#f") (("#!#f")
(string-append "#!" (assoc-ref %build-inputs "bash") (string-append "#!"
"/bin/bash"))))))) (search-input-file %build-inputs
"/bin/bash"))))))))
(inputs (inputs
`(("bash" ,bash) `(("bash" ,bash)
("bc" ,bc) ("bc" ,bc)
@ -3693,7 +3693,7 @@ everyone's screenshots nowadays.")
(output (assoc-ref %outputs "out")) (output (assoc-ref %outputs "out"))
(bindir (string-append output "/bin")) (bindir (string-append output "/bin"))
(docdir (string-append output "/share/doc/ufetch-" ,version)) (docdir (string-append output "/share/doc/ufetch-" ,version))
(tput (string-append (assoc-ref %build-inputs "tput") "/bin/tput"))) (tput (search-input-file %build-inputs "/bin/tput")))
(install-file (string-append source "/LICENSE") docdir) (install-file (string-append source "/LICENSE") docdir)
(setenv "PATH" (string-append (assoc-ref %build-inputs "bash") "/bin")) (setenv "PATH" (string-append (assoc-ref %build-inputs "bash") "/bin"))
(mkdir-p bindir) (mkdir-p bindir)
@ -4491,7 +4491,7 @@ text table representation to stdout.")
"\nPATH=" (getenv "PATH")))) "\nPATH=" (getenv "PATH"))))
;; check phase ;; check phase
(setenv "TERM" "linux") ;set to tty for test (setenv "TERM" "linux") ;set to tty for test
(invoke (string-append (assoc-ref %build-inputs "bats") "/bin/bats") (invoke (search-input-file %build-inputs "/bin/bats")
"test") "test")
;; install phase ;; install phase
(install-file "hosts" (string-append %output "/bin")) (install-file "hosts" (string-append %output "/bin"))

3
gnu/packages/backup.scm
View file

@ -840,8 +840,7 @@ NTFS volumes using @code{ntfs-3g}, preserving NTFS-specific attributes.")
;; You probably want a service with file(s) to point to. ;; You probably want a service with file(s) to point to.
(confdir "/etc/dirvish") (confdir "/etc/dirvish")
(perl (string-append (assoc-ref %build-inputs "perl") (perl (search-input-file inputs "/bin/perl"))
"/bin/perl"))
(loadconfig.pl (call-with-input-file "loadconfig.pl" (loadconfig.pl (call-with-input-file "loadconfig.pl"
read-string))) read-string)))

2
gnu/packages/code.scm
View file

@ -702,7 +702,7 @@ importantly we give you proper follow-symbol and find-references support.")
(substitute* "colormake" (substitute* "colormake"
(("colormake\\.pl") (string-append bin "/colormake.pl")) (("colormake\\.pl") (string-append bin "/colormake.pl"))
(("/bin/bash") (("/bin/bash")
(string-append (assoc-ref %build-inputs "bash") "/bin/sh"))) (search-input-file %build-inputs "/bin/sh")))
(install-file "colormake.1" (string-append doc "/man/man1")) (install-file "colormake.1" (string-append doc "/man/man1"))
(install-files '("AUTHORS" "BUGS" "ChangeLog" "README") doc) (install-files '("AUTHORS" "BUGS" "ChangeLog" "README") doc)
(install-files '("colormake" "colormake-short" "clmake" (install-files '("colormake" "colormake-short" "clmake"

4
gnu/packages/compression.scm
View file

@ -2428,8 +2428,8 @@ at run time, and must be installed separately.")
(bin (string-append (assoc-ref %outputs "out") "/bin")) (bin (string-append (assoc-ref %outputs "out") "/bin"))
(target (string-append bin "/" name)) (target (string-append bin "/" name))
(python (string-append (assoc-ref %build-inputs "python") "/bin")) (python (string-append (assoc-ref %build-inputs "python") "/bin"))
(7z (string-append (assoc-ref %build-inputs "p7zip") "/bin/7z")) (7z (search-input-file %build-inputs "/bin/7z"))
(unzip (string-append (assoc-ref %build-inputs "unzip") "/bin/unzip"))) (unzip (search-input-file %build-inputs "/bin/unzip")))
(setenv "PATH" (string-append (getenv "PATH") ":" python)) (setenv "PATH" (string-append (getenv "PATH") ":" python))
(mkdir-p bin) (mkdir-p bin)
(copy-file source target) (copy-file source target)

4
gnu/packages/debug.scm
View file

@ -561,9 +561,7 @@ input. Zzuf's behaviour is deterministic, making it easy to reproduce bugs.")
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "gui/GameConqueror.py" (substitute* "gui/GameConqueror.py"
(("/usr/bin/env python") (("/usr/bin/env python")
(string-append (assoc-ref %build-inputs (search-input-file inputs "/bin/python")))))
"python-wrapper") "/bin/python")))
#t))
(add-after 'install 'wrap-gameconqueror (add-after 'install 'wrap-gameconqueror
(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"))

18
gnu/packages/education.scm
View file

@ -337,17 +337,16 @@ easy.")
;; Replace the sole minified file in the package. ;; Replace the sole minified file in the package.
(with-directory-excursion (string-append share "/src") (with-directory-excursion (string-append share "/src")
(delete-file "FileSaver.min.js") (delete-file "FileSaver.min.js")
(symlink (string-append (assoc-ref %build-inputs "js-filesaver") (symlink (search-input-file %build-inputs
"/share/javascript/FileSaver.min.js") "/share/javascript/FileSaver.min.js")
"FileSaver.min.js")) "FileSaver.min.js"))
;; Create a "snap" executable. ;; Create a "snap" executable.
(let* ((bin (string-append out "/bin")) (let* ((bin (string-append out "/bin"))
(script (string-append bin "/snap")) (script (string-append bin "/snap"))
(snap (string-append share "/snap.html")) (snap (string-append share "/snap.html"))
(bash (string-append (assoc-ref %build-inputs "bash") (bash (search-input-file %build-inputs "/bin/sh"))
"/bin/sh")) (xdg-open (search-input-file %build-inputs
(xdg-open (string-append (assoc-ref %build-inputs "xdg-utils") "/bin/xdg-open")))
"/bin/xdg-open")))
(mkdir-p bin) (mkdir-p bin)
(call-with-output-file script (call-with-output-file script
(lambda (port) (lambda (port)
@ -589,10 +588,9 @@ letters of the alphabet, spelling, eye-hand coordination, etc.")
;; Install the launcher. ;; Install the launcher.
(let* ((bin (string-append out "/bin")) (let* ((bin (string-append out "/bin"))
(script (string-append bin "/omnitux")) (script (string-append bin "/omnitux"))
(bash (string-append (assoc-ref %build-inputs "bash") (bash (search-input-file %build-inputs "/bin/bash"))
"/bin/bash")) (python (search-input-file %build-inputs
(python (string-append (assoc-ref %build-inputs "python") "/bin/python2")))
"/bin/python2")))
(mkdir-p bin) (mkdir-p bin)
(with-output-to-file script (with-output-to-file script
(lambda () (lambda ()

2
gnu/packages/emacs-xyz.scm
View file

@ -16394,7 +16394,7 @@ Features:
;; Patch shebangs. ;; Patch shebangs.
(substitute* "epipe" (substitute* "epipe"
(("/usr/bin/env bash") (("/usr/bin/env bash")
(string-append (assoc-ref %build-inputs "bash") "/bin/bash"))) (search-input-file %build-inputs "/bin/bash")))
(patch-shebang "epipe.pl" (patch-shebang "epipe.pl"
(list (string-append (assoc-ref %build-inputs "perl") (list (string-append (assoc-ref %build-inputs "perl")
"/bin"))) "/bin")))

43
gnu/packages/games.scm
View file

@ -4390,8 +4390,8 @@ OpenGFX provides you with...
(arguments (arguments
`(#:make-flags `(#:make-flags
(list (string-append "DIR_NAME=opensfx") (list (string-append "DIR_NAME=opensfx")
(string-append "TAR=" (assoc-ref %build-inputs "tar") (string-append "TAR="
"/bin/tar")) (search-input-file %build-inputs "/bin/tar")))
;; The check phase only verifies md5sums, see openttd-opengfx. ;; The check phase only verifies md5sums, see openttd-opengfx.
#:tests? #f #:tests? #f
#:phases #:phases
@ -4440,8 +4440,8 @@ the original Transport Tycoon Deluxe.")
(arguments (arguments
`(#:make-flags `(#:make-flags
(list (string-append "DIR_NAME=openmsx") (list (string-append "DIR_NAME=openmsx")
(string-append "TAR=" (assoc-ref %build-inputs "tar") (string-append "TAR="
"/bin/tar")) (search-input-file %build-inputs "/bin/tar")))
;; The check phase only verifies md5sums, see openttd-opengfx. ;; The check phase only verifies md5sums, see openttd-opengfx.
#:tests? #f #:tests? #f
#:phases #:phases
@ -4513,7 +4513,7 @@ Transport Tycoon Deluxe.")
(openrct2-title-sequences (string-append out (openrct2-title-sequences (string-append out
"/share/openrct2/title-sequences")) "/share/openrct2/title-sequences"))
(source (assoc-ref %build-inputs "source")) (source (assoc-ref %build-inputs "source"))
(unzip (string-append (assoc-ref %build-inputs "unzip") "/bin/unzip"))) (unzip (search-input-file %build-inputs "/bin/unzip")))
(copy-file source (string-append ,name "-" ,version ".zip")) (copy-file source (string-append ,name "-" ,version ".zip"))
(invoke unzip (string-append ,name "-" ,version ".zip")) (invoke unzip (string-append ,name "-" ,version ".zip"))
(delete-file (string-append ,name "-" ,version ".zip")) (delete-file (string-append ,name "-" ,version ".zip"))
@ -4553,7 +4553,7 @@ Transport Tycoon Deluxe.")
(openrct2-objects (string-append out (openrct2-objects (string-append out
"/share/openrct2/objects")) "/share/openrct2/objects"))
(source (assoc-ref %build-inputs "source")) (source (assoc-ref %build-inputs "source"))
(unzip (string-append (assoc-ref %build-inputs "unzip") "/bin/unzip"))) (unzip (search-input-file %build-inputs "/bin/unzip")))
(copy-file source (string-append ,name "-" ,version ".zip")) (copy-file source (string-append ,name "-" ,version ".zip"))
(invoke unzip (string-append ,name "-" ,version ".zip")) (invoke unzip (string-append ,name "-" ,version ".zip"))
(delete-file (string-append ,name "-" ,version ".zip")) (delete-file (string-append ,name "-" ,version ".zip"))
@ -5714,14 +5714,10 @@ colors, pictures, and sounds.")
(script (string-append out "/bin/" ,name)) (script (string-append out "/bin/" ,name))
(data (string-append out "/share/" ,name)) (data (string-append out "/share/" ,name))
(source (assoc-ref %build-inputs "source")) (source (assoc-ref %build-inputs "source"))
(unzip (string-append (assoc-ref %build-inputs "unzip") (unzip (search-input-file %build-inputs "/bin/unzip"))
"/bin/unzip")) (patch (search-input-file %build-inputs "/bin/patch"))
(patch (string-append (assoc-ref %build-inputs "patch") (bash (search-input-file %build-inputs "/bin/bash"))
"/bin/patch")) (love (search-input-file %build-inputs "/bin/love")))
(bash (string-append (assoc-ref %build-inputs "bash")
"/bin/bash"))
(love (string-append (assoc-ref %build-inputs "love")
"/bin/love")))
(mkdir-p (dirname script)) (mkdir-p (dirname script))
(with-output-to-file script (with-output-to-file script
@ -6683,7 +6679,7 @@ fight against their plot and save his fellow rabbits from slavery.")
(use-modules (guix build utils)) (use-modules (guix build utils))
(let ((out (assoc-ref %outputs "out")) (let ((out (assoc-ref %outputs "out"))
(source (assoc-ref %build-inputs "source")) (source (assoc-ref %build-inputs "source"))
(tar (string-append (assoc-ref %build-inputs "tar") "/bin/tar")) (tar (search-input-file %build-inputs "/bin/tar"))
(xz-path (string-append (assoc-ref %build-inputs "xz") "/bin"))) (xz-path (string-append (assoc-ref %build-inputs "xz") "/bin")))
(setenv "PATH" xz-path) (setenv "PATH" xz-path)
(mkdir out) (mkdir out)
@ -7758,7 +7754,7 @@ quotation from a collection of quotes.")
(let* ((out (assoc-ref %outputs "out")) (let* ((out (assoc-ref %outputs "out"))
(xonotic (string-append out "/share/xonotic")) (xonotic (string-append out "/share/xonotic"))
(source (assoc-ref %build-inputs "source")) (source (assoc-ref %build-inputs "source"))
(unzip (string-append (assoc-ref %build-inputs "unzip") "/bin/unzip"))) (unzip (search-input-file %build-inputs "/bin/unzip")))
(copy-file source (string-append ,name "-" ,version ".zip")) (copy-file source (string-append ,name "-" ,version ".zip"))
(invoke unzip (string-append ,name "-" ,version ".zip")) (invoke unzip (string-append ,name "-" ,version ".zip"))
(mkdir-p out) (mkdir-p out)
@ -9547,8 +9543,7 @@ on items and player adaptability for character progression.")
(share (string-append out "/share/drascula")) (share (string-append out "/share/drascula"))
(scummvm (assoc-ref %build-inputs "scummvm"))) (scummvm (assoc-ref %build-inputs "scummvm")))
;; Install data. ;; Install data.
(let ((unzip (string-append (assoc-ref %build-inputs "unzip") (let ((unzip (search-input-file %build-inputs "/bin/unzip"))
"/bin/unzip"))
(doc (string-append out "/share/doc/" ,name "-" ,version))) (doc (string-append out "/share/doc/" ,name "-" ,version)))
(for-each (for-each
(lambda (input) (lambda (input)
@ -9574,8 +9569,7 @@ on items and player adaptability for character progression.")
;; Create standalone executable. ;; Create standalone executable.
(let* ((bin (string-append out "/bin")) (let* ((bin (string-append out "/bin"))
(executable (string-append bin "/drascula")) (executable (string-append bin "/drascula"))
(bash (string-append (assoc-ref %build-inputs "bash") (bash (search-input-file %build-inputs "/bin/bash")))
"/bin/bash")))
(mkdir-p bin) (mkdir-p bin)
(with-output-to-file executable (with-output-to-file executable
(lambda () (lambda ()
@ -9665,8 +9659,7 @@ the World and demonstrating that he is even more evil than his brother Vlad.")
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(executable (string-append bin "/" ,name)) (executable (string-append bin "/" ,name))
(scummvm (assoc-ref %build-inputs "scummvm"))) (scummvm (assoc-ref %build-inputs "scummvm")))
(let ((unzip (string-append (assoc-ref %build-inputs "unzip") (let ((unzip (search-input-file %build-inputs "/bin/unzip")))
"/bin/unzip")))
(invoke unzip "-j" (assoc-ref %build-inputs "source"))) (invoke unzip "-j" (assoc-ref %build-inputs "source")))
(let ((doc (string-append share "/doc/" ,name "-" ,version))) (let ((doc (string-append share "/doc/" ,name "-" ,version)))
(for-each (lambda (f) (install-file f doc)) (for-each (lambda (f) (install-file f doc))
@ -9772,8 +9765,7 @@ Skorl. Maybe it would be an idea to try and escape...")
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(executable (string-append bin "/" ,name)) (executable (string-append bin "/" ,name))
(scummvm (assoc-ref %build-inputs "scummvm"))) (scummvm (assoc-ref %build-inputs "scummvm")))
(let ((unzip (string-append (assoc-ref %build-inputs "unzip") (let ((unzip (search-input-file %build-inputs "/bin/unzip")))
"/bin/unzip")))
(invoke unzip "-j" (assoc-ref %build-inputs "source"))) (invoke unzip "-j" (assoc-ref %build-inputs "source")))
(let ((doc (string-append share "/doc/" ,name "-" ,version))) (let ((doc (string-append share "/doc/" ,name "-" ,version)))
(install-file "readme.txt" doc)) (install-file "readme.txt" doc))
@ -9871,8 +9863,7 @@ women and 6-foot-tall pygmies.")
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(executable (string-append bin "/" ,name)) (executable (string-append bin "/" ,name))
(scummvm (assoc-ref %build-inputs "scummvm"))) (scummvm (assoc-ref %build-inputs "scummvm")))
(let ((unzip (string-append (assoc-ref %build-inputs "unzip") (let ((unzip (search-input-file %build-inputs "/bin/unzip")))
"/bin/unzip")))
(invoke unzip "-j" (assoc-ref %build-inputs "source"))) (invoke unzip "-j" (assoc-ref %build-inputs "source")))
(let ((doc (string-append share "/doc/bass-" ,version))) (let ((doc (string-append share "/doc/bass-" ,version)))
(install-file "readme.txt" doc)) (install-file "readme.txt" doc))

3
gnu/packages/gnome.scm
View file

@ -7713,8 +7713,7 @@ users.")
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(let ((out (assoc-ref %outputs "out")) (let ((out (assoc-ref %outputs "out"))
(dhclient (string-append (assoc-ref %build-inputs "isc-dhcp") (dhclient (search-input-file %build-inputs "/sbin/dhclient")))
"/sbin/dhclient")))
(list (list
;; Otherwise, the RUNPATH will lack the final 'NetworkManager' path ;; Otherwise, the RUNPATH will lack the final 'NetworkManager' path
;; component. ;; component.

4
gnu/packages/gnuzilla.scm
View file

@ -1457,9 +1457,7 @@ standards of the IceCat project.")
(mozconfig (string-append (getcwd) "/.mozconfig"))) (mozconfig (string-append (getcwd) "/.mozconfig")))
(setenv "SHELL" bash) (setenv "SHELL" bash)
(setenv "AUTOCONF" (setenv "AUTOCONF"
(string-append (assoc-ref %build-inputs (search-input-file %build-inputs "/bin/autoconf"))
"autoconf")
"/bin/autoconf"))
(setenv "CONFIG_SHELL" bash) (setenv "CONFIG_SHELL" bash)
(setenv "QA_CONFIGURE_OPTIONS" ".*") (setenv "QA_CONFIGURE_OPTIONS" ".*")
(setenv "MOZBUILD_STATE_PATH" (setenv "MOZBUILD_STATE_PATH"

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

@ -4623,12 +4623,12 @@ including parsing and code generation.")
(delete-file-recursively "docs") (delete-file-recursively "docs")
#t)) #t))
(add-after 'install 'install-info-documentation (add-after 'install 'install-info-documentation
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((share (string-append (assoc-ref outputs "out") "/share")) (let* ((share (string-append (assoc-ref outputs "out") "/share"))
(doc (string-append share "/doc/" ,name "-" ,version)) (doc (string-append share "/doc/" ,name "-" ,version))
(info (string-append share "/info/")) (info (string-append share "/info/"))
(makeinfo (string-append (assoc-ref %build-inputs "texinfo") (makeinfo (search-input-file inputs
"/bin/makeinfo"))) "/bin/makeinfo")))
(invoke makeinfo "guile-shapefile.texi" "-o" info) (invoke makeinfo "guile-shapefile.texi" "-o" info)
#t)))))) #t))))))
(inputs (inputs

4
gnu/packages/hurd.scm
View file

@ -581,8 +581,8 @@ implementing them.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
(list (string-append "SHELL=" (assoc-ref %build-inputs "bash") (list (string-append "SHELL="
"/bin/bash") (search-input-file %build-inputs "/bin/bash"))
"PKGDIR=libdde_linux26" "PKGDIR=libdde_linux26"
,@(if (%current-target-system) ,@(if (%current-target-system)
(list "CC=i586-pc-gnu-gcc" (list "CC=i586-pc-gnu-gcc"

9
gnu/packages/javascript.scm
View file

@ -80,8 +80,7 @@
(use-modules (guix build utils)) (use-modules (guix build utils))
(chdir (assoc-ref %build-inputs "source")) (chdir (assoc-ref %build-inputs "source"))
(let ((target (string-append %output "/share/javascript/context-menu"))) (let ((target (string-append %output "/share/javascript/context-menu")))
(apply invoke (string-append (assoc-ref %build-inputs "esbuild") (apply invoke (search-input-file %build-inputs "/bin/esbuild")
"/bin/esbuild")
"--bundle" "--bundle"
"--tsconfig=tsconfig.json" "--tsconfig=tsconfig.json"
(string-append "--outdir=" target) (string-append "--outdir=" target)
@ -209,8 +208,7 @@ be able to view it naturally and easily.")))
(begin (begin
(use-modules (guix build utils)) (use-modules (guix build utils))
(chdir (assoc-ref %build-inputs "source")) (chdir (assoc-ref %build-inputs "source"))
(let ((esbuild (string-append (assoc-ref %build-inputs "esbuild") (let ((esbuild (search-input-file %build-inputs "/bin/esbuild"))
"/bin/esbuild"))
(target (string-append %output "/share/javascript/commander"))) (target (string-append %output "/share/javascript/commander")))
(invoke esbuild (invoke esbuild
"--bundle" "--bundle"
@ -251,8 +249,7 @@ command-line interfaces. ")
(begin (begin
(use-modules (guix build utils)) (use-modules (guix build utils))
(chdir (assoc-ref %build-inputs "source")) (chdir (assoc-ref %build-inputs "source"))
(let ((esbuild (string-append (assoc-ref %build-inputs "esbuild") (let ((esbuild (search-input-file %build-inputs "/bin/esbuild"))
"/bin/esbuild"))
(target (string-append %output "/share/javascript/xmldom-sre"))) (target (string-append %output "/share/javascript/xmldom-sre")))
(invoke esbuild (invoke esbuild
"--bundle" "--bundle"

4
gnu/packages/kde-frameworks.scm
View file

@ -3070,8 +3070,8 @@ to easily extend the contacts collection.")
(substitute* "autotests/runnercontexttest.cpp" (substitute* "autotests/runnercontexttest.cpp"
(("/home\"") "/tmp\"") ;; single path-part (("/home\"") "/tmp\"") ;; single path-part
(("//usr/bin\"") (string-append (getcwd) "\"")) ;; multiple path-parts (("//usr/bin\"") (string-append (getcwd) "\"")) ;; multiple path-parts
(("/bin/ls" path) (("/bin/ls")
(string-append (assoc-ref %build-inputs "coreutils") path))))) (search-input-file %build-inputs "/bin/ls")))))
(add-before 'check 'check-setup (add-before 'check 'check-setup
(lambda _ (lambda _
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))

4
gnu/packages/kodi.scm
View file

@ -508,8 +508,8 @@ plug-in system.")
(use-modules (guix build utils)) (use-modules (guix build utils))
(copy-recursively (assoc-ref %build-inputs "source") ".") (copy-recursively (assoc-ref %build-inputs "source") ".")
(substitute* "kodi-cli" (substitute* "kodi-cli"
(("/bin/bash") (string-append (assoc-ref %build-inputs "bash") (("/bin/bash")
"/bin/bash")) (search-input-file %build-inputs "/bin/bash"))
(("output=\\$\\((curl)" all curl) (("output=\\$\\((curl)" all curl)
(string-append "output=$(" (string-append "output=$("
(assoc-ref %build-inputs "curl") (assoc-ref %build-inputs "curl")

4
gnu/packages/libreoffice.scm
View file

@ -972,8 +972,8 @@ library.")
(myspell (string-append out "/share/myspell")) (myspell (string-append out "/share/myspell"))
(doc (string-append out "/share/doc/" (doc (string-append out "/share/doc/"
,name)) ,name))
(unzip (string-append (assoc-ref %build-inputs "unzip") (unzip (search-input-file %build-inputs
"/bin/unzip"))) "/bin/unzip")))
(invoke unzip "-j" "-o" (assoc-ref %build-inputs "source")) (invoke unzip "-j" "-o" (assoc-ref %build-inputs "source"))
(invoke unzip "-j" "-o" "pl_PL.zip") (invoke unzip "-j" "-o" "pl_PL.zip")
(for-each (cut install-file <> hunspell) (for-each (cut install-file <> hunspell)

3
gnu/packages/linux.scm
View file

@ -2287,8 +2287,7 @@ module.")
(ice-9 ftw) (ice-9 ftw)
(srfi srfi-26)) (srfi srfi-26))
(let ((e2fsck (string-append (assoc-ref %build-inputs "e2fsprogs") (let ((e2fsck (search-input-file %build-inputs "/sbin/e2fsck"))
"/sbin/e2fsck"))
(bin (string-append (assoc-ref %outputs "out") "/sbin"))) (bin (string-append (assoc-ref %outputs "out") "/sbin")))
(mkdir-p bin) (mkdir-p bin)
(with-directory-excursion bin (with-directory-excursion bin

3
gnu/packages/markup.scm
View file

@ -90,8 +90,7 @@ processing library written in C.")
(let ((source (assoc-ref %build-inputs "source")) (let ((source (assoc-ref %build-inputs "source"))
(out (assoc-ref %outputs "out")) (out (assoc-ref %outputs "out"))
(perlbd (string-append (assoc-ref %build-inputs "perl") "/bin")) (perlbd (string-append (assoc-ref %build-inputs "perl") "/bin"))
(unzip (string-append (assoc-ref %build-inputs "unzip") (unzip (search-input-file %build-inputs "/bin/unzip")))
"/bin/unzip")))
(mkdir-p out) (mkdir-p out)
(with-directory-excursion out (with-directory-excursion out
(invoke unzip source) (invoke unzip source)

4
gnu/packages/maths.scm
View file

@ -1381,9 +1381,9 @@ extremely large and complex data collections.")
#:make-flags #:make-flags
(list (string-append "HDFLIB=" (assoc-ref %build-inputs "hdf4") "/lib") (list (string-append "HDFLIB=" (assoc-ref %build-inputs "hdf4") "/lib")
(string-append "HDF5LIB=" (assoc-ref %build-inputs "hdf5") "/lib") (string-append "HDF5LIB=" (assoc-ref %build-inputs "hdf5") "/lib")
(string-append "ZLIB=" (assoc-ref %build-inputs "zlib") "/lib/libz.so") (string-append "ZLIB=" (search-input-file %build-inputs "/lib/libz.so"))
(string-append "JPEGLIB=" (string-append "JPEGLIB="
(assoc-ref %build-inputs "libjpeg") "/lib/libjpeg.so") (search-input-file %build-inputs "/lib/libjpeg.so"))
"LLEXT=so") "LLEXT=so")
#:phases #:phases

5
gnu/packages/multiprecision.scm
View file

@ -379,8 +379,9 @@ multiplies.")
#:make-flags #:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")) (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"CFLAGS += -DLTM_DESC -DUSE_LTM" "CFLAGS += -DLTM_DESC -DUSE_LTM"
(string-append "EXTRALIBS=" (assoc-ref %build-inputs "libtommath") (string-append "EXTRALIBS="
"/lib/libtommath.so") (search-input-file %build-inputs
"/lib/libtommath.so"))
(string-append "CC=" ,(cc-for-target))))) (string-append "CC=" ,(cc-for-target)))))
(native-inputs (native-inputs
`(("libtool" ,libtool))) `(("libtool" ,libtool)))

5
gnu/packages/networking.scm
View file

@ -3701,8 +3701,9 @@ written (and providing API) in C. Current implementation covers YANG 1.0 (RFC
#:phases (modify-phases %standard-phases (delete 'configure)) #:phases (modify-phases %standard-phases (delete 'configure))
#:make-flags #:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")) (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "PKG_CONFIG=" (assoc-ref %build-inputs "pkg-config") (string-append "PKG_CONFIG="
"/bin/pkg-config") (search-input-file %build-inputs
"/bin/pkg-config"))
,(string-append "CC=" (cc-for-target))))) ,(string-append "CC=" (cc-for-target)))))
(home-page "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki") (home-page "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki")
(synopsis "Management tool for the mesh networking BATMAN protocol") (synopsis "Management tool for the mesh networking BATMAN protocol")

5
gnu/packages/python-xyz.scm
View file

@ -936,9 +936,8 @@ to CommonMark.")
(lambda _ (lambda _
(substitute* "pymediainfo/__init__.py" (substitute* "pymediainfo/__init__.py"
(("libmediainfo.so.0") (("libmediainfo.so.0")
(string-append (assoc-ref %build-inputs "libmediainfo") (search-input-file %build-inputs
"/lib/libmediainfo.so.0"))) "/lib/libmediainfo.so.0")))))
#t))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?

9
gnu/packages/shells.scm
View file

@ -297,12 +297,13 @@ and syntax highlighting.")
,(string-append func-path "/fenv.apply.fish") ,(string-append func-path "/fenv.apply.fish")
,(string-append func-path "/fenv.main.fish")) ,(string-append func-path "/fenv.main.fish"))
(("bash") (("bash")
(string-append (assoc-ref %build-inputs "bash") "/bin/bash")) (search-input-file %build-inputs "/bin/bash"))
(("sed") (("sed")
(string-append (assoc-ref %build-inputs "sed") "/bin/sed")) (search-input-file %build-inputs "/bin/sed"))
((" tr ") ((" tr ")
(string-append " " (assoc-ref %build-inputs "coreutils") (string-append " "
"/bin/tr "))))))) (search-input-file %build-inputs "/bin/tr")
" ")))))))
(inputs (inputs
`(("bash" ,bash) `(("bash" ,bash)
("coreutils" ,coreutils) ("coreutils" ,coreutils)

3
gnu/packages/tex.scm
View file

@ -6132,8 +6132,7 @@ TeX metrics (VF and TFM files) and macros for use with LaTeX.")
(use-modules (guix build utils)) (use-modules (guix build utils))
(let ((target (string-append (assoc-ref %outputs "out") (let ((target (string-append (assoc-ref %outputs "out")
"/share/texmf-dist/")) "/share/texmf-dist/"))
(unzip (string-append (assoc-ref %build-inputs "unzip") (unzip (search-input-file %build-inputs "/bin/unzip")))
"/bin/unzip")))
(invoke unzip (assoc-ref %build-inputs "source")) (invoke unzip (assoc-ref %build-inputs "source"))
(mkdir-p target) (mkdir-p target)
(copy-recursively "iwona" target) (copy-recursively "iwona" target)

2
gnu/packages/upnp.scm
View file

@ -63,7 +63,7 @@
;; the configure phase. ;; the configure phase.
`(#:make-flags `(#:make-flags
(list (list
(string-append "SH=" (assoc-ref %build-inputs "bash") "/bin/sh") (string-append "SH=" (search-input-file %build-inputs "/bin/sh"))
(string-append "INSTALLPREFIX=" (assoc-ref %outputs "out")) (string-append "INSTALLPREFIX=" (assoc-ref %outputs "out"))
,(string-append "CC=" (cc-for-target)) ,(string-append "CC=" (cc-for-target))

6
gnu/packages/version-control.scm
View file

@ -2553,10 +2553,8 @@ Features include:
#:builder #:builder
(begin (begin
(use-modules (guix build utils)) (use-modules (guix build utils))
(let ((bash (string-append (assoc-ref %build-inputs "bash") (let ((bash (search-input-file %build-inputs "/bin/bash"))
"/bin/bash")) (rclone (search-input-file %build-inputs "/bin/rclone")))
(rclone (string-append (assoc-ref %build-inputs "rclone")
"/bin/rclone")))
(copy-file (string-append (assoc-ref %build-inputs "source") (copy-file (string-append (assoc-ref %build-inputs "source")
"/git-annex-remote-rclone") "/git-annex-remote-rclone")
"git-annex-remote-rclone") "git-annex-remote-rclone")

12
gnu/packages/virtualization.scm
View file

@ -173,7 +173,7 @@
`(#:tests? ,(or (%current-target-system) `(#:tests? ,(or (%current-target-system)
(not (string=? "i686-linux" (%current-system)))) (not (string=? "i686-linux" (%current-system))))
#:configure-flags #:configure-flags
(let ((gcc (string-append (assoc-ref %build-inputs "gcc") "/bin/gcc")) (let ((gcc (search-input-file %build-inputs "/bin/gcc"))
(out (assoc-ref %outputs "out"))) (out (assoc-ref %outputs "out")))
(list (string-append "--cc=" gcc) (list (string-append "--cc=" gcc)
;; Some architectures insist on using HOST_CC. ;; Some architectures insist on using HOST_CC.
@ -1535,10 +1535,12 @@ domains, their live performance and resource utilization statistics.")
(list (string-append "PREFIX=" (assoc-ref %outputs "out")) (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "LIBDIR=" (assoc-ref %outputs "out") (string-append "LIBDIR=" (assoc-ref %outputs "out")
"/lib") "/lib")
(string-append "ASCIIDOC=" (assoc-ref %build-inputs "asciidoc") (string-append "ASCIIDOC="
"/bin/asciidoc") (search-input-file %build-inputs
(string-append "XMLTO=" (assoc-ref %build-inputs "xmlto") "/bin/asciidoc"))
"/bin/xmlto")) (string-append "XMLTO="
(search-input-file %build-input
"/bin/xmlto")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure

4
gnu/packages/web.scm
View file

@ -1011,8 +1011,8 @@ and UNIX socket support.")
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list "--disable-plugin" ;NPAPI plugins are obsolete nowadays. (list "--disable-plugin" ;NPAPI plugins are obsolete nowadays.
(string-append "BIN_BASH=" (assoc-ref %build-inputs "bash") (string-append "BIN_BASH="
"/bin/bash") (search-input-file %build-inputs "/bin/bash"))
(string-append "--with-jdk-home=" (assoc-ref %build-inputs "jdk"))))) (string-append "--with-jdk-home=" (assoc-ref %build-inputs "jdk")))))
(outputs '("out" "doc")) (outputs '("out" "doc"))
(native-inputs (native-inputs

9
gnu/packages/wm.scm
View file

@ -1932,12 +1932,9 @@ productive, customizable lisp based systems.")
(copy-recursively (assoc-ref %build-inputs "source") ".") (copy-recursively (assoc-ref %build-inputs "source") ".")
(chdir "util/stumpish") (chdir "util/stumpish")
(substitute* "stumpish" (substitute* "stumpish"
(("rlwrap") (string-append (assoc-ref %build-inputs "rlwrap") (("rlwrap") (search-input-file %build-inputs "/bin/rlwrap"))
"/bin/rlwrap")) (("xprop") (search-input-file %build-inputs "/bin/xprop"))
(("xprop") (string-append (assoc-ref %build-inputs "xprop") (("/bin/sh") (search-input-file %build-inputs "/bin/bash")))
"/bin/xprop"))
(("/bin/sh") (string-append (assoc-ref %build-inputs "bash")
"/bin/bash")))
(install-file "stumpish" (string-append %output "/bin"))))) (install-file "stumpish" (string-append %output "/bin")))))
(home-page "https://github.com/stumpwm/stumpwm-contrib") (home-page "https://github.com/stumpwm/stumpwm-contrib")
(synopsis "StumpWM interactive shell") (synopsis "StumpWM interactive shell")