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

gnu: sbsigntools: Update to 0.9.5.

Browse source 
This fixes a build failure with openssl-3.

* gnu/packages/efi.scm (sbsigntools): Update to 0.9.5.
[arguments]: Remove trailing #t's. Use Gexps. Use "this-package-input". Simplify lambdas.
[inputs]: Remove labels.

Signed-off-by: Josselin Poiret <dev@jpoiret.xyz>
This commit is contained in:
kiasoc5 2023-05-29 17:53:41 -04:00 committed by Josselin Poiret
parent b741218e91
commit f72f3a909a
No known key found for this signature in database
GPG key ID: 505E40B916171A8A
1 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
gnu/packages/efi.scm
View file

@ -30,6 +30,7 @@ (define-module (gnu packages efi)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
@ -99,7 +100,7 @@ (define-public efi-analyzer
(define-public sbsigntools (define-public sbsigntools
(package (package
(name "sbsigntools") (name "sbsigntools")
(version "0.9.4") (version "0.9.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -110,34 +111,32 @@ (define-public sbsigntools
(recursive? #t))) (recursive? #t)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1y76wy65y6k10mjl2dm5hb5ms475alr4s080xzj8y833x01xvf3m")))) (base32 "060n6w0dx1mrilhdv482ncckanqz6pdv53piimiki0bm15d2fcp4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
(add-after 'unpack 'patch-more-shebangs #~(modify-phases %standard-phases
(lambda* (#:key inputs #:allow-other-keys) (add-after 'unpack 'patch-more-shebangs
(substitute* "lib/ccan.git/tools/create-ccan-tree" (lambda* (#:key inputs native-inputs #:allow-other-keys)
(("#!/bin/bash") (substitute* "lib/ccan.git/tools/create-ccan-tree"
(string-append "#!" (("#!/bin/bash")
(assoc-ref inputs "bash") (string-append "#!"
"/bin/bash"))) (search-input-file (or native-inputs inputs)
#t)) "/bin/bash"))))))
(add-after 'unpack 'patch (add-after 'unpack 'patch
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda _
(substitute* '("configure.ac" (substitute* '("configure.ac"
"tests/Makefile.am") "tests/Makefile.am")
(("/usr/include/efi") (("/usr/include/efi")
(string-append (assoc-ref inputs "gnu-efi") (string-append #$(this-package-input "gnu-efi")
"/include/efi")) "/include/efi"))
(("/usr/lib/gnuefi") (("/usr/lib/gnuefi")
(string-append (assoc-ref inputs "gnu-efi") (string-append #$(this-package-input "gnu-efi")
"/lib"))) "/lib")))))
#t)) (add-after 'unpack 'setenv
(add-after 'unpack 'setenv (lambda _
(lambda _ (setenv "CC" #$(cc-for-target)))))))
(setenv "CC" "gcc")
#t)))))
(native-inputs (native-inputs
(list autoconf (list autoconf
automake automake
@ -146,9 +145,9 @@ (define-public sbsigntools
pkg-config pkg-config
util-linux)) ; getopt util-linux)) ; getopt
(inputs (inputs
`(("gnu-efi" ,gnu-efi) (list gnu-efi
("libuuid" ,util-linux "lib") `(,util-linux "lib") ; libuuid
("openssl" ,openssl))) openssl))
(synopsis "EFI signing tools") (synopsis "EFI signing tools")
(description "This package provides tools for signing EFI binaries.") (description "This package provides tools for signing EFI binaries.")
(home-page "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/") (home-page "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/")