Merge pull request #139497 from r-burns/tensorflow-nvidia-x11

python3Packages.tensorflow-bin: remove nvidia_x11 reference

pkgs/development/libraries/science/math/tensorflow/bin.nix

@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchurl
 , addOpenGLRunpath
-, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11
+, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn
 }:
 
 with lib;
@@ -17,7 +17,7 @@ let
   platform =  "x86_64";
 
   rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib]
-                           ++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]);
+                           ++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn ]);
 
   packages = import ./binary-hashes.nix;
 

pkgs/development/python-modules/tensorflow/bin.nix

@@ -23,7 +23,6 @@
 , cudaSupport ? false
 , cudatoolkit ? null
 , cudnn ? null
-, nvidia_x11 ? null
 , zlib
 , python
 , symlinkJoin
@@ -41,8 +40,7 @@
 # - the source build is currently brittle and not easy to maintain
 
 assert cudaSupport -> cudatoolkit != null
-                   && cudnn != null
-                   && nvidia_x11 != null;
+                   && cudnn != null;
 
 # unsupported combination
 assert ! (stdenv.isDarwin && cudaSupport);
@@ -126,7 +124,6 @@ in buildPythonPackage {
         cudatoolkit.out
         cudatoolkit.lib
         cudnn
-        nvidia_x11
       ];
 
       libpaths = [

pkgs/top-level/all-packages.nix

@@ -2061,7 +2061,6 @@ with pkgs;
 
   libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix {
     cudaSupport = config.cudaSupport or false;
-    inherit (linuxPackages) nvidia_x11;
     cudatoolkit = cudatoolkit_10_0;
     cudnn = cudnn_cudatoolkit_10_0;
   };

pkgs/top-level/python-packages.nix

@@ -8859,7 +8859,6 @@ in {
 
   tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/bin.nix {
     cudaSupport = pkgs.config.cudaSupport or false;
-    inherit (pkgs.linuxPackages) nvidia_x11;
     cudatoolkit = pkgs.cudatoolkit_11_0;
     cudnn = pkgs.cudnn_cudatoolkit_11_0;
   };