From b04fc593e7b55fe1f74421b11589f12a339c92e2 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 31 Dec 2020 14:48:55 +0700 Subject: treewide: cmake buildInputs to nativeBuildInputs, minor cleanups --- pkgs/development/libraries/libsnark/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries/libsnark') diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index 227353e0a9f82..6de498f6d29e5 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: let rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; @@ -7,7 +7,8 @@ in stdenv.mkDerivation rec { name = "libsnark-pre${version}"; version = stdenv.lib.substring 0 8 rev; - buildInputs = [ cmake pkgconfig openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; + 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" ]; @@ -19,8 +20,6 @@ in stdenv.mkDerivation rec { fetchSubmodules = true; }; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "C++ library for zkSNARKs"; homepage = "https://github.com/scipr-lab/libsnark"; -- cgit 1.4.1