diff options
author | Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com> | 2017-05-29 19:24:34 +0200 |
---|---|---|
committer | Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com> | 2017-05-30 11:06:19 +0200 |
commit | 1fdf42d4612b6872a2625b3ba2f8750263281312 (patch) | |
tree | 8397cef8dde658ce24fb805e228d3bac3619b116 /pkgs/development/python-modules/tensorflow | |
parent | 1d56c2fa434b2cf875aab4eabcfd69fa89fe25eb (diff) | |
download | nixlib-1fdf42d4612b6872a2625b3ba2f8750263281312.tar nixlib-1fdf42d4612b6872a2625b3ba2f8750263281312.tar.gz nixlib-1fdf42d4612b6872a2625b3ba2f8750263281312.tar.bz2 nixlib-1fdf42d4612b6872a2625b3ba2f8750263281312.tar.lz nixlib-1fdf42d4612b6872a2625b3ba2f8750263281312.tar.xz nixlib-1fdf42d4612b6872a2625b3ba2f8750263281312.tar.zst nixlib-1fdf42d4612b6872a2625b3ba2f8750263281312.zip |
pythonPackages.tensorflow: Don't change the rpath to point to gcc4.9
When using cuda, the rpath was set to include GCC lib version 4.9. I am not sure what this was attempting to do, but an effect was to prevent certain python libraries to find the correct (newer) version of the std lib. Also avoid mentions of any specifc version in the propagatedBuildInputs
Diffstat (limited to 'pkgs/development/python-modules/tensorflow')
-rw-r--r-- | pkgs/development/python-modules/tensorflow/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 8946877eb142..388d27e06867 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -5,7 +5,6 @@ , cudaSupport ? false , cudatoolkit ? null , cudnn ? null -, gcc49 ? null , linuxPackages ? null , numpy , six @@ -13,13 +12,11 @@ , swig , werkzeug , mock -, gcc , zlib }: assert cudaSupport -> cudatoolkit != null && cudnn != null - && gcc49 != null && linuxPackages != null; # unsupported combination @@ -98,7 +95,7 @@ buildPythonPackage rec { propagatedBuildInputs = with stdenv.lib; [ numpy six protobuf3_2 swig werkzeug mock ] - ++ optionals cudaSupport [ cudatoolkit cudnn gcc49 ]; + ++ optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ]; # Note that we need to run *after* the fixup phase because the # libraries are loaded at runtime. If we run in preFixup then @@ -106,10 +103,10 @@ buildPythonPackage rec { postFixup = let rpath = stdenv.lib.makeLibraryPath (if cudaSupport then - [ gcc49.cc.lib zlib cudatoolkit cudnn + [ stdenv.cc.cc.lib zlib cudatoolkit cudnn linuxPackages.nvidia_x11 ] else - [ gcc.cc.lib zlib ] + [ stdenv.cc.cc.lib zlib ] ); in '' |