diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index b5c0f5451c23..689349fb05ac 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -48,11 +48,18 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "facebookresearch"; - repo = pname; - rev = "v${version}"; + repo = "faiss"; + rev = "refs/tags/v${version}"; hash = "sha256-P8TynU6jz5NbcWLdI7n4LX5Gdz0Ks72bmOzQ3LGjQCQ="; }; + postPatch = lib.optionalString pythonSupport '' + substituteInPlace faiss/python/loader.py \ + --replace-fail \ + "# platform-dependent legacy fallback using numpy.distutils.cpuinfo" \ + "return False" + ''; + nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [ @@ -63,7 +70,6 @@ stdenv.mkDerivation { pythonPackages.python pythonPackages.setuptools pythonPackages.pip - pythonPackages.wheel ]; buildInputs = diff --git a/pkgs/development/python-modules/faiss/default.nix b/pkgs/development/python-modules/faiss/default.nix index f6eee8cc5e32..39e34a1879e8 100644 --- a/pkgs/development/python-modules/faiss/default.nix +++ b/pkgs/development/python-modules/faiss/default.nix @@ -7,7 +7,6 @@ packaging, setuptools, pip, - wheel, }: buildPythonPackage { @@ -24,7 +23,6 @@ buildPythonPackage { build-system = [ setuptools pip - wheel ]; dependencies = [