Skip to content

Commit 40f09ba

Browse files
committed
zokrates working commit
1 parent d7a7559 commit 40f09ba

File tree

3 files changed

+49
-13
lines changed

3 files changed

+49
-13
lines changed

flake.lock

Lines changed: 25 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,18 @@
99
inputs = {
1010
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
1111
flake-utils.url = github:numtide/flake-utils;
12+
rust-overlay = {
13+
url = "github:oxalica/rust-overlay";
14+
inputs.nixpkgs.follows = "nixpkgs";
15+
inputs.flake-utils.follows = "flake-utils";
16+
};
1217
};
1318

1419
outputs = {
1520
self,
1621
nixpkgs,
1722
flake-utils,
23+
rust-overlay,
1824
}:
1925
{
2026
overlays.default = import ./overlay.nix;
@@ -26,6 +32,7 @@
2632
inherit system;
2733
overlays = [
2834
self.overlays.default
35+
rust-overlay.overlays.default
2936
];
3037
};
3138
in {

packages/zokrates/default.nix

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
{
22
lib,
33
fetchgit,
4-
stdenv,
54
pkgs,
65
}:
7-
stdenv.mkDerivation rec {
8-
pname = "zokrates";
9-
version = "0.8.4";
6+
with pkgs;
7+
rustPlatform.buildRustPackage rec {
8+
pname = "zokrates";
9+
version = "0.8.4";
10+
cargoBuildFlags = "-p zokrates_cli";
1011

11-
src = fetchgit {
12-
url = "https://github.com/Zokrates/ZoKrates.git";
13-
rev = "v${version}";
14-
sha256 = "sha256-DFfY6FVKvajqbS28xCvRh/Hf+Qi1cx2XZ34gboZG9XE=";
15-
};
12+
src = fetchgit {
13+
url = "https://github.com/Zokrates/ZoKrates.git";
14+
rev = "${version}";
15+
sha256 = "sha256-++xQJjl1cK7PrqOJ8aiA8gmi+QSDB8jiKZ/bNbZnTyw=";
16+
};
1617

17-
nativeBuildInputs = with pkgs; [];
18-
buildInputs = with pkgs; [];
19-
}
18+
cargoSha256 = "sha256-yXCgu07OCDbvatZlPdF2g3ek+0NxOmq31j8xFYbCmpI=";
19+
20+
nativeBuildInputs = [pkg-config rust-bin.nightly."2022-07-01".default];
21+
PKG_CONFIG_PATH = "${openssl.dev}/lib/pkgconfig";
22+
23+
buildInputs = [];
24+
}

0 commit comments

Comments
 (0)