diff options
| author | Andreas Enge <[email protected]> | 2023-03-20 18:21:47 +0100 |
|---|---|---|
| committer | Andreas Enge <[email protected]> | 2023-03-20 18:49:06 +0100 |
| commit | ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe (patch) | |
| tree | 4ab573cee33f277828ad553a22579175b1dda22d /gnu/packages/hurd.scm | |
| parent | 098bd280f82350073e8280e37d56a14162eed09c (diff) | |
| parent | f80215c7c4ae5ea0c316f4766e6c05ae4218ede3 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/hurd.scm')
| -rw-r--r-- | gnu/packages/hurd.scm | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 1dcec3ea3c..7f02e6141d 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017 Manolis Fragkiskos Ragkousis <[email protected]> -;;; Copyright © 2018, 2020-2022 Ludovic Courtès <[email protected]> +;;; Copyright © 2018, 2020-2023 Ludovic Courtès <[email protected]> ;;; Copyright © 2020 Efraim Flashner <[email protected]> ;;; Copyright © 2020 Marius Bakke <[email protected]> ;;; Copyright © 2020, 2022 Jan (janneke) Nieuwenhuizen <[email protected]> @@ -122,19 +122,21 @@ GNU/Hurd." "1gyda8sq6b379nx01hkpbd85lz39irdvz2b9wbr63gicicx8i706")))) (build-system gnu-build-system) ;; Flex is needed both at build and run time. - (inputs (list gnumach-headers flex perl)) - (native-inputs - (list flex bison)) - (arguments `(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'install 'patch-non-shebang-references - (lambda* (#:key build inputs outputs #:allow-other-keys) - (let ((perl (assoc-ref inputs "perl")) - (out (assoc-ref outputs "out"))) - (substitute* (string-append out "/bin/mig") - (("perl ") (string-append perl "/bin/perl "))) - #t)))))) + (inputs (list gnumach-headers flex)) + (native-inputs (list flex bison)) + (arguments + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'avoid-perl-dependency + (lambda* (#:key build inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + ;; By default 'mig' (or 'TARGET-mig') uses Perl to + ;; compute 'libexecdir_rel'. Avoid it. + (substitute* (find-files bin "mig$") + (("^libexecdir_rel=.*") + "libexecdir_rel=../libexec\n")))))))) (home-page "https://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html") (synopsis "Mach 3.0 interface generator for the Hurd") (description |