pyrox.dev / nixpkgs
lol
fork atom

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)

Ryan Burns 7ba89a2e 90ce4282

+3 -8
unified split
+2 -2
pkgs/development/libraries/science/math/tensorflow/bin.nix
··· 1 1 { lib, stdenv 2 2 , fetchurl 3 3 , addOpenGLRunpath 4 - , cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11 4 + , cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn 5 5 }: 6 6 7 7 with lib; ··· 17 17 platform = "x86_64"; 18 18 19 19 rpath = makeLibraryPath ([stdenv.cc.libc stdenv.cc.cc.lib] 20 - ++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]); 20 + ++ optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn ]); 21 21 22 22 packages = import ./binary-hashes.nix; 23 23
+1 -4
pkgs/development/python-modules/tensorflow/bin.nix
··· 23 23 , cudaSupport ? false 24 24 , cudatoolkit ? null 25 25 , cudnn ? null 26 - , nvidia_x11 ? null 27 26 , zlib 28 27 , python 29 28 , symlinkJoin ··· 41 40 # - the source build is currently brittle and not easy to maintain 42 41 43 42 assert cudaSupport -> cudatoolkit != null 44 - && cudnn != null 45 - && nvidia_x11 != null; 43 + && cudnn != null; 46 44 47 45 # unsupported combination 48 46 assert ! (stdenv.isDarwin && cudaSupport); ··· 126 124 cudatoolkit.out 127 125 cudatoolkit.lib 128 126 cudnn 129 - nvidia_x11 130 127 ]; 131 128 132 129 libpaths = [
-1
pkgs/top-level/all-packages.nix
··· 2058 2058 2059 2059 libtensorflow-bin = callPackage ../development/libraries/science/math/tensorflow/bin.nix { 2060 2060 cudaSupport = config.cudaSupport or false; 2061 - inherit (linuxPackages) nvidia_x11; 2062 2061 cudatoolkit = cudatoolkit_10_0; 2063 2062 cudnn = cudnn_cudatoolkit_10_0; 2064 2063 };
-1
pkgs/top-level/python-packages.nix
··· 8831 8831 8832 8832 tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/bin.nix { 8833 8833 cudaSupport = pkgs.config.cudaSupport or false; 8834 - inherit (pkgs.linuxPackages) nvidia_x11; 8835 8834 cudatoolkit = pkgs.cudatoolkit_11_0; 8836 8835 cudnn = pkgs.cudnn_cudatoolkit_11_0; 8837 8836 };