summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2020-12-31 23:40:14 -0600
committerGitHub <noreply@github.com>2020-12-31 23:40:14 -0600
commit299c95ac165e9e4c5e55788e02031a155e8f7723 (patch)
tree00a370f68fa7d05108e6b11566a019f215124269
parentd841f374c6c53f18514e8d9ea5ed8ec6018bff45 (diff)
parenta9ecac2538ac0ab3d1ce42ec34b0ea18699f7844 (diff)
downloadnixpkgs-299c95ac165e9e4c5e55788e02031a155e8f7723.tar
nixpkgs-299c95ac165e9e4c5e55788e02031a155e8f7723.tar.gz
nixpkgs-299c95ac165e9e4c5e55788e02031a155e8f7723.tar.bz2
nixpkgs-299c95ac165e9e4c5e55788e02031a155e8f7723.tar.lz
nixpkgs-299c95ac165e9e4c5e55788e02031a155e8f7723.tar.xz
nixpkgs-299c95ac165e9e4c5e55788e02031a155e8f7723.tar.zst
nixpkgs-299c95ac165e9e4c5e55788e02031a155e8f7723.zip
Merge pull request #107944 from matthewbauer/tensorflow-no-sysctl
tensorflow1: disable sysctl.h in hwloc
-rw-r--r--pkgs/development/python-modules/tensorflow/1/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix
index 599f809f864..4dd30e4687a 100644
--- a/pkgs/development/python-modules/tensorflow/1/default.nix
+++ b/pkgs/development/python-modules/tensorflow/1/default.nix
@@ -258,6 +258,11 @@ let
 
       substituteInPlace tensorflow/tools/pip_package/setup.py \
         --replace "numpy >= 1.16.0, < 1.19.0" "numpy >= 1.16.0"
+
+      # glibc 2.31+ does not have sys/sysctl.h
+      # see https://github.com/tensorflow/tensorflow/issues/45861
+      substituteInPlace third_party/hwloc/BUILD.bazel\
+        --replace "#define HAVE_SYS_SYSCTL_H 1" "#undef HAVE_SYS_SYSCTL_H"
     '';
 
     preConfigure = let