From 7ba89a2e22ebd4c0aa014ae21982c32f8020f6ec Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sat, 25 Sep 2021 18:12:51 -0700
Subject: [PATCH] python3Packages.tensorflow-bin: remove nvidia_x11 reference

the nvidia driver should be picked up from /run/opengl-driver/lib
(and is, since we're already using addOpenGLRunpath)
---
 pkgs/development/libraries/science/math/tensorflow/bin.nix | 4 ++--
 pkgs/development/python-modules/tensorflow/bin.nix         | 5 +----
 pkgs/top-level/all-packages.nix                            | 1 -
 pkgs/top-level/python-packages.nix                         | 1 -
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix
index d42026c13cf9..b57d1191933b 100644
--- a/pkgs/development/libraries/science/math/tensorflow/bin.nix
+++ b/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;
 
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index f5960f0e29ec..8d8690d3e5c5 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/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 = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffec1ea5c52f..2608e6b7f3b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2058,7 +2058,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;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1d95c5ff5414..ad4e76023250 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8831,7 +8831,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;
   };