diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-10-23 22:53:12 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-10-23 23:05:21 +0200 |
| commit | 2dffe4767c64e00a2b97b71b9e2ac568ffc99595 (patch) | |
| tree | f103a9611d8c02ea63d88f8f7b3c92ff8fd30201 /gnu/packages/shells.scm | |
| parent | e5f21c7e38fc7c61271e532f434284c94cd6fbb3 (diff) | |
| download | guix-2dffe4767c64e00a2b97b71b9e2ac568ffc99595.tar guix-2dffe4767c64e00a2b97b71b9e2ac568ffc99595.tar.gz | |
gnu: Use 'search-input-file' some more.
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.
Diffstat (limited to 'gnu/packages/shells.scm')
| -rw-r--r-- | gnu/packages/shells.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 6f8f515096..acc5ac9e49 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -297,12 +297,13 @@ and syntax highlighting.") ,(string-append func-path "/fenv.apply.fish") ,(string-append func-path "/fenv.main.fish")) (("bash") - (string-append (assoc-ref %build-inputs "bash") "/bin/bash")) + (search-input-file %build-inputs "/bin/bash")) (("sed") - (string-append (assoc-ref %build-inputs "sed") "/bin/sed")) + (search-input-file %build-inputs "/bin/sed")) ((" tr ") - (string-append " " (assoc-ref %build-inputs "coreutils") - "/bin/tr "))))))) + (string-append " " + (search-input-file %build-inputs "/bin/tr") + " "))))))) (inputs `(("bash" ,bash) ("coreutils" ,coreutils) |