push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,31 @@
diff --git a/configure.ac b/configure.ac
index 4ffb68f..d8a8265 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,15 +71,16 @@ AM_CONDITIONAL(TEST_BINARY_FORMAT, [ test "$EFI_ARCH" = "arm" -o "$EFI_ARCH" = "
# no consistent view of where gnu-efi should dump the efi stuff, so find it
##
for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi /usr/lib/gnuefi /usr/lib64/gnuefi ; do
- if test -e $path/crt0-efi-$EFI_ARCH.o; then
- CRTPATH=$path
+ if test -e @@NIX_GNUEFI@@/$path/crt0-efi-$EFI_ARCH.o; then
+ CRTPATH=@@NIX_GNUEFI@@/$path
+ break
fi
done
if test -z "$CRTPATH"; then
AC_MSG_ERROR([cannot find the gnu-efi crt path])
fi
-EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \
+EFI_CPPFLAGS="-I@@NIX_GNUEFI@@/include/efi -I@@NIX_GNUEFI@@/include/efi/$EFI_ARCH \
-DEFI_FUNCTION_WRAPPER"
CPPFLAGS_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $EFI_CPPFLAGS"
@@ -90,5 +91,5 @@ AC_SUBST(EFI_ARCH, $EFI_ARCH)
AC_SUBST(CRTPATH, $CRTPATH)
AC_CONFIG_FILES([Makefile src/Makefile lib/ccan/Makefile]
- [docs/Makefile tests/Makefile])
+ [docs/Makefile])
AC_OUTPUT

View File

@@ -0,0 +1,76 @@
{
lib,
stdenv,
fetchgit,
autoconf,
automake,
pkg-config,
help2man,
openssl,
libuuid,
gnu-efi,
libbfd,
}:
stdenv.mkDerivation rec {
pname = "sbsigntool";
version = "0.9.5";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git";
rev = "v${version}";
hash = "sha256-5DInWgl1gThjjfGOsts1H1s1GbMCkd0gjbmG3gA3Fhg=";
};
patches = [ ./autoconf.patch ];
prePatch = "patchShebangs .";
nativeBuildInputs = [
autoconf
automake
pkg-config
help2man
];
buildInputs = [
openssl
libuuid
libbfd
gnu-efi
];
configurePhase = ''
runHook preConfigure
substituteInPlace configure.ac --replace "@@NIX_GNUEFI@@" "${gnu-efi}"
lib/ccan.git/tools/create-ccan-tree --build-type=automake lib/ccan "talloc read_write_all build_assert array_size endian"
touch AUTHORS
touch ChangeLog
echo "SUBDIRS = lib/ccan src docs" >> Makefile.am
aclocal
autoheader
autoconf
automake --add-missing -Wno-portability
./configure --prefix=$out
runHook postConfigure
'';
meta = with lib; {
description = "Tools for maintaining UEFI signature databases";
homepage = "http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases";
maintainers = with maintainers; [
hmenke
raitobezarius
];
platforms = [
"x86_64-linux"
"aarch64-linux"
]; # Broken on i686
license = licenses.gpl3;
};
}