diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-31 06:01:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-31 06:01:16 +0000 |
| commit | 5a9ca012a5174dce66440678e75ca1499ef5015f (patch) | |
| tree | b9f06badf57d3d68c591ca2d66be2cdeb94895c3 /pkgs/development/libraries | |
| parent | 9d424dbc41b23409e7f1293803e03fc7e5bf3db6 (diff) | |
| parent | ad625c8a3dee0da41aa390143f7e9f143681a456 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/libff/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/rapidfuzz-cpp/default.nix | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libff/default.nix b/pkgs/development/libraries/libff/default.nix index 36e8bb78c8398..af2191fb4136c 100644 --- a/pkgs/development/libraries/libff/default.nix +++ b/pkgs/development/libraries/libff/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config +, enableStatic ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "libff"; @@ -15,9 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_PROCPS=Off" ] ++ lib.optionals stdenv.isAarch64 [ "-DCURVE=ALT_BN128" "-DUSE_ASM=OFF" ]; - # CMake is hardcoded to always build static library which causes linker - # failure for Haskell applications depending on haskellPackages.hevm on macOS. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString (!enableStatic) '' substituteInPlace libff/CMakeLists.txt --replace "STATIC" "SHARED" ''; diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index ae4b5176e3af3..04698cc1a9c06 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rapidfuzz-cpp"; - version = "1.3.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${version}"; - hash = "sha256-LhMubYSq5EO4Pup+mVPQpcXwur/bPz+NZ1CcyqDt6lM="; + hash = "sha256-HhVkOPZ9LGoF5HSs0tOiZyUQWBwrfDTKJMc8WwGOdq8="; }; patches = [ |