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

gnu: beep: Update to 1.4.12.

Browse source 
* gnu/packages/terminals.scm (beep): Update to 1.4.12.
[arguments]: Set $(CC) #:make-flag.
Manually substitute the correct value of make check's $(PWD). (!)
This commit is contained in:
Tobias Geerinckx-Rice 2022-05-08 02:00:04 +02:00
parent cd00881d72
commit de15ca7af8
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/terminals.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 José Miguel Sánchez García <jmi2k@openmailbox.org> ;;; Copyright © 2016, 2017 José Miguel Sánchez García <jmi2k@openmailbox.org>
;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2017 Petter <petter@mykolab.ch>
@ -559,7 +559,7 @@ (define-public picocom
(define-public beep (define-public beep
(package (package
(name "beep") (name "beep")
(version "1.4.10") (version "1.4.12")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -572,11 +572,12 @@ (define-public beep
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "05c2gxfqc12rgp88c65q7f5ha9gzh222vdh0qpdq1zmyhqj43pq1")))) (base32 "0dgrb5yg4ys1fa4hs95iz3m2yhryfzzw0j6g6yf6vhbys4ihcf40"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
(list (string-append "prefix=" (assoc-ref %outputs "out")) (list (string-append "CC=" ,(cc-for-target))
(string-append "prefix=" (assoc-ref %outputs "out"))
(string-append "pkgdocdir=$(docdir)/" ,name "-" ,version)) (string-append "pkgdocdir=$(docdir)/" ,name "-" ,version))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -585,9 +586,14 @@ (define-public beep
(lambda _ (lambda _
(substitute* "GNUmakefile" (substitute* "GNUmakefile"
(("/bin/bash") (("/bin/bash")
(which "bash"))) (which "bash"))
;; XXX In the build environment, $(PWD) is the *parent* directory
;; /tmp/guix-build-beep-x.y.drv-0! A pure guix shell works fine.
(("\\$\\(PWD\\)" pwd)
(string-append pwd "/source")))
(substitute* (find-files "tests" "\\.expected") (substitute* (find-files "tests" "\\.expected")
;; The build environment lacks /dev/{console,tty*}. ;; The build environment lacks /dev/{console,tty*}.
;; In fact, even nckx's regular Guix System lacks ttyS1…
((": Permission denied") ((": Permission denied")
": No such file or directory"))))))) ": No such file or directory")))))))
(synopsis "Linux command-line utility to control the PC speaker") (synopsis "Linux command-line utility to control the PC speaker")