diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/build-tools.scm | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in:
gnu/packages/ibus.scm
gnu/packages/image.scm
gnu/packages/lisp.scm
gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/packages/build-tools.scm')
| -rw-r--r-- | gnu/packages/build-tools.scm | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 3d03c37a2c..38ad13db1f 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -661,7 +661,7 @@ software.") sqlite)) (native-inputs (list pkg-config)) - (home-page "http://gittup.org/tup/") + (home-page "https://gittup.org/tup/") (synopsis "Fast build system that's hard to get wrong") (description "Tup is a generic build system based on a directed acyclic graphs of commands to be executed. Tup instruments your build to detect the @@ -973,16 +973,29 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.") ("NormalizationTest.txt" . "uninorm") ("auxiliary/GraphemeBreakTest.txt" . "unigbrk") ("auxiliary/WordBreakTest.txt" . "uniwbrk"))) - (delete-file "gen-uni-tables"))))))) - (inputs ;; Shebangs for some auxiliary build files. - (list python perl clisp)) + (delete-file "gen-uni-tables")))) + (add-after 'install 'restore-shebangs + (lambda _ + (substitute* (find-files + (string-append #$output "/src/gnulib") + (lambda (fname stat) + (and (not (string-suffix? "/lib/javaversion.class" fname)) + (not (string-suffix? ".mo" fname))))) + (("^#! ?(.*)/bin/sh" _ prefix) + "#!/bin/sh") + (("^#! ?(.*)/bin/python3" _ prefix) + "#!/usr/bin/env python3") + (("^#! ?(.*)/bin/([a-zA-Z0-9-]+)" _ prefix program) + (string-append "#!/usr/bin/" program)))))))) + (inputs + (list bash-minimal)) ;shebang for gnulib-tool (native-inputs (list - python perl clisp + bash-minimal python perl clisp ;; Unicode data: ucd-next ;; Programs for the tests: - cppi indent git autoconf)) + cppi indent git-minimal/pinned autoconf)) (home-page "https://www.gnu.org/software/gnulib/") (synopsis "Source files to share among distributions") (description @@ -997,7 +1010,8 @@ maintenance-related files, for convenience.") (native-search-paths (list (search-path-specification (variable "GNULIB_SRCDIR") - (files (list "src/gnulib"))))) + (files (list "src/gnulib")) + (separator #f)))) (license (list license:lgpl2.0+ license:gpl3+)))) (define-public gnulib |