jitterentropy: 2.2.0 -> 3.3.1

Split outputs to put headers aside
This commit is contained in:
c0bw3b 2022-01-27 16:55:30 +01:00
parent b3a390543b
commit b30014d473
2 changed files with 12 additions and 31 deletions

View file

@ -1,37 +1,31 @@
{ lib, stdenv, fetchFromGitHub }: { lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jitterentropy"; pname = "jitterentropy";
version = "2.2.0"; version = "3.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "smuellerDD"; owner = "smuellerDD";
repo = "jitterentropy-library"; repo = "jitterentropy-library";
rev = "v${version}"; rev = "v${version}";
sha256 = "0n2l1fxr7bynnarpwdjifb2fvlsq8w5wmfh31yk5nrc756cjlgyw"; hash = "sha256-go7eGwBoZ58LkgKL7t8oZSc1cFlE6fPOT/ML3Aa8+CM=";
}; };
patches = [
# Can be removed when upgrading beyond 2.2.0 outputs = [ "out" "dev" ];
./reproducible-manpages.patch
];
enableParallelBuilding = true; enableParallelBuilding = true;
hardeningDisable = [ "fortify" ]; # avoid warnings
preInstall = ''
mkdir -p $out/include
substituteInPlace Makefile \
--replace "install -m 0755 -s" \
'install -m 0755 -s --strip-program $(STRIP)'
'';
installFlags = [ installFlags = [
"PREFIX=$(out)" "PREFIX=${placeholder "out"}"
]; ];
meta = { meta = with lib; {
description = "Provides a noise source using the CPU execution timing jitter"; description = "Provides a noise source using the CPU execution timing jitter";
homepage = "https://github.com/smuellerDD/jitterentropy-library"; homepage = "https://github.com/smuellerDD/jitterentropy-library";
license = with lib.licenses; [ gpl2 bsd3 ]; changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${version}/CHANGES.md";
platforms = lib.platforms.linux; license = with licenses; [ bsd3 /* OR */ gpl2Only ];
maintainers = with lib.maintainers; [ johnazoidberg ]; platforms = platforms.linux;
maintainers = with maintainers; [ johnazoidberg c0bw3b ];
}; };
} }

View file

@ -1,13 +0,0 @@
diff --git a/Makefile b/Makefile
index 4ff069b..3b8714a 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ cppcheck:
install:
install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3
install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/
- gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
+ gzip -n -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3
install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR)
install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/
install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR)