From cd53948d6d61b330aa59756b8e2e1f77a9cb0f37 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 2 Dec 2022 09:56:52 -0800 Subject: [PATCH 1/4] python310Packages.rapidfuzz: disable LTO to fix aarch64-darwin build --- pkgs/development/python-modules/rapidfuzz/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 27cc7f80f2df..c5cc8ab925dc 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 @@ -52,6 +53,10 @@ buildPythonPackage rec { export RAPIDFUZZ_BUILD_EXTENSION=1 ''; + NIX_CFLAGS_COMPILE = lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [ + "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098 + ]; + propagatedBuildInputs = [ jarowinkler numpy From 0efb882d3f9bda5382110b6e5b59be14203fbb70 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 2 Dec 2022 13:27:14 -0800 Subject: [PATCH 2/4] python310Packages.rapidfuzz: add CMake flags to fix build on x86_64-darwin --- pkgs/development/python-modules/rapidfuzz/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index c5cc8ab925dc..519103fe6314 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -51,6 +51,8 @@ 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) [ From 13d189d68649c442602607a2d24f4ee807e795ab Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 3 Dec 2022 11:26:19 -0800 Subject: [PATCH 3/4] python310Packages.rapidfuzz: 2.12.2 -> 2.12.3 --- pkgs/development/python-modules/rapidfuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 519103fe6314..3c0ac6c0c7fc 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "2.13.2"; + version = "2.13.3"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-a83Vww9dEh0nNylnZwCm6PJYmfKvw5RnMLerfKfN1dY="; + hash = "sha256-hx8DNFxzD41tvxcKaSqqKkxJMlcrxAaihulUdkzyOt0="; }; nativeBuildInputs = [ From c4950e533e535a5b3add343340f8c6321deb2462 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 3 Dec 2022 15:40:42 -0800 Subject: [PATCH 4/4] python310Packages.levenshtein: disable LTO to fix aarch64-darwin build --- pkgs/development/python-modules/levenshtein/default.nix | 5 +++++ 1 file changed, 5 insertions(+) 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 ];