diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2025-08-21 11:11:54 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-08-25 12:16:57 +0200 |
| commit | f0afd378c5ca1bb881d9583ff2b72dee7e35348f (patch) | |
| tree | 75114dc436b309ee09ca5ec8542014d377b10e13 | |
| parent | eb680136f19cdfb497f6fc8288e85fb968cb95fe (diff) | |
gnu: guix-data-service: Use ‘search-input-file’ and ‘which’.
* gnu/packages/web.scm (guix-data-service)[arguments]: In
‘wrap-executable’ phase, use ‘which’ and ‘search-input-file’ instead of
relying on input labels.
Change-Id: Id45c91b46a444fd85a97a719bdf21fa05e395324
| -rw-r--r-- | gnu/packages/web.scm | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 663048c86fe..ab775746ecc 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Aljosha Papsch <misc@rpapsch.de> -;;; Copyright © 2014-2024 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014-2025 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015-2024 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Raoul Jean Pierre Bonnal <ilpuccio.febo@gmail.com> @@ -5584,11 +5584,9 @@ Cloud.") (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) - (guile (assoc-ref inputs "guile")) (guile-effective-version (read-line - (open-pipe* OPEN_READ - (string-append guile "/bin/guile") + (open-pipe* OPEN_READ (which "guile") "-c" "(display (effective-version))"))) (scm (string-append out "/share/guile/site/" guile-effective-version)) @@ -5604,13 +5602,11 @@ Cloud.") `("PATH" ":" prefix ,(cons* bin - (map (lambda (input) - (string-append - (assoc-ref inputs input) - "/bin")) - '("ephemeralpg" - "util-linux" - "postgresql")))) + (map (lambda (file) + (search-input-file inputs file)) + '("/bin/pg_tmp" ;ephemeralpg + "/bin/ionice" ;util-linux + "/bin/psql")))) ;postgresql `("GUILE_LOAD_PATH" ":" prefix (,scm ,(getenv "GUILE_LOAD_PATH"))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix |