tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
sbsigntool: 0.9.1 -> 0.9.4
Henri Menke
3 years ago
aa8115c4
55cadbcf
+11
-9
2 changed files
expand all
collapse all
unified
split
pkgs
tools
security
sbsigntool
autoconf.patch
default.nix
+7
-5
pkgs/tools/security/sbsigntool/autoconf.patch
reviewed
···
1
1
-
--- sbsigntools/configure.ac 2018-09-25 10:30:00.878766256 -0500
2
2
-
+++ configure.ac.new 2018-09-25 10:34:56.231277375 -0500
3
3
-
@@ -71,15 +71,16 @@
1
1
+
diff --git a/configure.ac b/configure.ac
2
2
+
index 4ffb68f..d8a8265 100644
3
3
+
--- a/configure.ac
4
4
+
+++ b/configure.ac
5
5
+
@@ -71,15 +71,16 @@ AM_CONDITIONAL(TEST_BINARY_FORMAT, [ test "$EFI_ARCH" = "arm" -o "$EFI_ARCH" = "
4
6
# no consistent view of where gnu-efi should dump the efi stuff, so find it
5
7
##
6
6
-
for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi; do
8
8
+
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
7
9
- if test -e $path/crt0-efi-$EFI_ARCH.o; then
8
10
- CRTPATH=$path
9
11
+ if test -e @@NIX_GNUEFI@@/$path/crt0-efi-$EFI_ARCH.o; then
···
20
22
-DEFI_FUNCTION_WRAPPER"
21
23
CPPFLAGS_save="$CPPFLAGS"
22
24
CPPFLAGS="$CPPFLAGS $EFI_CPPFLAGS"
23
23
-
@@ -90,5 +91,5 @@
25
25
+
@@ -90,5 +91,5 @@ AC_SUBST(EFI_ARCH, $EFI_ARCH)
24
26
AC_SUBST(CRTPATH, $CRTPATH)
25
27
26
28
AC_CONFIG_FILES([Makefile src/Makefile lib/ccan/Makefile]
+4
-4
pkgs/tools/security/sbsigntool/default.nix
reviewed
···
3
3
, openssl, libuuid, gnu-efi, libbfd
4
4
}:
5
5
6
6
-
stdenv.mkDerivation {
6
6
+
stdenv.mkDerivation rec {
7
7
pname = "sbsigntool";
8
8
-
version = "0.9.1";
8
8
+
version = "0.9.4";
9
9
10
10
src = fetchgit {
11
11
url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git";
12
12
-
rev = "v0.9.1";
13
13
-
sha256 = "098gxmhjn8acxjw5bq59wq4xhgkpx1xn8kjvxwdzpqkwq9ivrsbp";
12
12
+
rev = "v${version}";
13
13
+
sha256 = "sha256-dbjdA+hjII/k7wABTTJV5RBdy4KlNkFlBWEaX4zn5vg=";
14
14
};
15
15
16
16
patches = [ ./autoconf.patch ];