diff options
| author | Robert Scott <code@humanleg.org.uk> | 2022-12-04 22:35:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-04 22:35:39 +0000 |
| commit | e169cf5b3b1e6cc4a25ff15087c2621605f83409 (patch) | |
| tree | 9419f781a5ccba5138dd52cdea12ecc87b90b1f3 | |
| parent | tmuxPlugins.copy-toolkit: init at 1.1 (diff) | |
| parent | python310Packages.levenshtein: disable LTO to fix aarch64-darwin build (diff) | |
| download | nixpkgs-e169cf5b3b1e6cc4a25ff15087c2621605f83409.tar.gz | |
Merge pull request #204379 from tjni/backport-rapidfuzz
[Backport release-22.11] python310Packages.rapidfuzz: backport fixes to 22.11
| -rw-r--r-- | pkgs/development/python-modules/levenshtein/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/python-modules/rapidfuzz/default.nix | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 835552ee526b..fe554a78ffed 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -36,6 +37,10 @@ buildPythonPackage rec { rapidfuzz-cpp ]; + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ + "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098 + ]; + propagatedBuildInputs = [ rapidfuzz ]; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 27cc7f80f2df..519103fe6314 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -50,8 +51,14 @@ buildPythonPackage rec { preBuild = '' export RAPIDFUZZ_BUILD_EXTENSION=1 + '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + export CMAKE_ARGS="-DCMAKE_CXX_COMPILER_AR=$AR -DCMAKE_CXX_COMPILER_RANLIB=$RANLIB" ''; + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ + "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098 + ]; + propagatedBuildInputs = [ jarowinkler numpy |