ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-19 05:07:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

qt-build-system: Look up the interpreter in 'inputs'.

Browse source 
* guix/build/qt-build-system.scm (wrap-all-programs): Pass
  the shell interpreter from 'inputs' to 'wrap-program' using
  'search-input-file'.

Partially-Fixes: <https://issues.guix.gnu.org/47869>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Maxime Devos 2021-05-31 19:20:12 +02:00 committed by Ludovic Courtès
parent 5b24cbee31
commit 2ac898d7f8
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
guix/build/qt-build-system.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2014, 2015, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@ -126,6 +127,12 @@ (define input-directories
(((_ . dir) ...)
dir)))
;; Do not require bash to be present in the package inputs
;; even when there is nothing to wrap.
;; Also, calculate (sh) only once to prevent some I/O.
(define %sh (delay (search-input-file inputs "bin/bash")))
(define (sh) (force %sh))
(define handle-output
(match-lambda
((output . directory)
@ -135,7 +142,7 @@ (define handle-output
(append (list directory)
input-directories))))
(when (not (null? vars-to-wrap))
(for-each (cut apply wrap-program <> vars-to-wrap)
(for-each (cut apply wrap-program <> #:sh (sh) vars-to-wrap)
bin-list)))))))
(for-each handle-output outputs)