Skip to content

Commit 8a88a52

Browse files
committed
Fill in metadata for libblst pkg-config in wasm nix derivation
1 parent e532443 commit 8a88a52

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

flake.nix

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
hlint = "3.10";
154154
};
155155
# and from nixpkgs or other inputs
156-
shell.nativeBuildInputs = with nixpkgs; [gh git jq yq-go actionlint shellcheck snappy protobuf buf ];
156+
shell.nativeBuildInputs = with nixpkgs; [gh git jq yq-go actionlint shellcheck snappy protobuf buf];
157157
# disable Hoogle until someone request it
158158
shell.withHoogle = false;
159159
# Skip cross compilers for the shell
@@ -202,8 +202,8 @@
202202
}
203203
({pkgs, ...}: {
204204
packages.proto-lens-protobuf-types.components.library.build-tools = [pkgs.buildPackages.protobuf];
205-
# This is only needed when doing codegen in cardano-rpc itself
206-
# packages.cardano-rpc.components.library.build-tools = [pkgs.buildPackages.protobuf];
205+
# This is only needed when doing codegen in cardano-rpc itself
206+
# packages.cardano-rpc.components.library.build-tools = [pkgs.buildPackages.protobuf];
207207
})
208208
];
209209
});
@@ -224,11 +224,15 @@
224224
libsodium =
225225
wasm-pkgs.callPackage ./nix/libsodium.nix {inherit wasi-sdk;};
226226
secp256k1 = (wasm-pkgs.callPackage ./nix/secp256k1.nix {inherit wasi-sdk;}).overrideAttrs (_: {
227-
src = inputs.iohkNix.inputs.secp256k1;
228-
});
229-
blst = (wasm-pkgs.callPackage ./nix/blst.nix {inherit wasi-sdk;}).overrideAttrs (_: {
230-
src = inputs.iohkNix.inputs.blst;
227+
src = nixpkgs.secp256k1.src;
231228
});
229+
blst =
230+
(wasm-pkgs.callPackage ./nix/blst.nix {
231+
inherit wasi-sdk;
232+
version = nixpkgs.blst.version;
233+
}).overrideAttrs (_: {
234+
src = nixpkgs.blst.src;
235+
});
232236
};
233237
in
234238
lib.optionalAttrs (system != "x86_64-darwin") {

nix/blst.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
fetchFromGitHub,
44
autoreconfHook,
55
wasi-sdk,
6+
version,
67
}:
78
stdenvNoCC.mkDerivation (finalAttrs: {
89
name = "blst";
@@ -44,9 +45,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
4445
includedir=''\\''${prefix}/include
4546
4647
Name: libblst
47-
Description: bogus
48-
URL: bogus
49-
Version: 0.0
48+
Description: blst (pronounced 'blast') is a BLS12-381 signature library focused on performance and security. It is written in C and assembly.
49+
URL: https://github.com/supranational/blst
50+
Version: ${version}
5051
5152
Cflags: -I''\\''${includedir}
5253
Libs: -L''\\''${libdir} -lblst

0 commit comments

Comments
 (0)