Skip to content

Commit 63f5683

Browse files
authored
jitterentropy: switch to cmake build, darwin support, with lib; cleanup, RFC format (#354238)
2 parents cfe735b + 1513742 commit 63f5683

File tree

1 file changed

+22
-14
lines changed

1 file changed

+22
-14
lines changed
Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
{ lib, stdenv, fetchFromGitHub }:
1+
{
2+
lib,
3+
stdenv,
4+
cmake,
5+
fetchFromGitHub,
6+
}:
27

38
stdenv.mkDerivation rec {
49
pname = "jitterentropy";
@@ -11,24 +16,27 @@ stdenv.mkDerivation rec {
1116
hash = "sha256-CPvgc/W5Z2OfbP9Lp2tQevUQZr+xlh6q5r5Fp2WUHhg=";
1217
};
1318

14-
outputs = [ "out" "dev" ];
19+
nativeBuildInputs = [ cmake ];
1520

16-
enableParallelBuilding = true;
17-
hardeningDisable = [ "fortify" ]; # avoid warnings
18-
19-
# prevent jitterentropy from builtin strip to allow controlling this from the derivation's
20-
# settings. Also fixes a strange issue, where this strip may fail when cross-compiling.
21-
installFlags = [
22-
"INSTALL_STRIP=install"
23-
"PREFIX=${placeholder "out"}"
21+
outputs = [
22+
"out"
23+
"dev"
2424
];
2525

26-
meta = with lib; {
26+
hardeningDisable = [ "fortify" ]; # avoid warnings
27+
28+
meta = {
2729
description = "Provides a noise source using the CPU execution timing jitter";
2830
homepage = "https://github.com/smuellerDD/jitterentropy-library";
2931
changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${version}/CHANGES.md";
30-
license = with licenses; [ bsd3 /* OR */ gpl2Only ];
31-
platforms = platforms.linux;
32-
maintainers = with maintainers; [ johnazoidberg c0bw3b ];
32+
license = with lib.licenses; [
33+
bsd3 # OR
34+
gpl2Only
35+
];
36+
platforms = lib.platforms.linux ++ lib.platforms.darwin;
37+
maintainers = with lib.maintainers; [
38+
johnazoidberg
39+
c0bw3b
40+
];
3341
};
3442
}

0 commit comments

Comments
 (0)