summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Kenji Okada <thiagokokada@gmail.com>2023-01-08 12:10:13 +0000
committerGitHub <noreply@github.com>2023-01-08 12:10:13 +0000
commitef9a582661fc0e0e0b026bcca32cf7ecdc136308 (patch)
treee135c1033e24a944524929de9149a2a78c6fe41e
parentebdd60caf62e058e909241dbc96feb776985fc2b (diff)
parent62cd6c97c8e6a51d07c13cd31be4362f5103f7cb (diff)
Merge pull request #209007 from wegank/libsnark-aarch64
libsnark: unbreak on aarch64
-rw-r--r--pkgs/development/libraries/libsnark/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix
index cbd6048f457c..54360cad4ed9 100644
--- a/pkgs/development/libraries/libsnark/default.nix
+++ b/pkgs/development/libraries/libsnark/default.nix
@@ -7,7 +7,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps;
- cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ];
+ cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" ]
+ ++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [ "-DWITH_SUPERCOP=OFF" ]
+ ++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCURVE=ALT_BN128" ];
src = fetchFromGitHub {
rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07";
@@ -22,7 +24,5 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/scipr-lab/libsnark";
license = licenses.mit;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
- # never built on aarch64-darwin since first introduction in nixpkgs
- broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64);
};
}