diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-08-03 20:43:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 20:43:39 +0200 |
| commit | 2356a84bbd91921d93f2be626eb3c7fea2abac58 (patch) | |
| tree | 1bc85d41127a9be4dfd16e664463b6832102bffa /pkgs/development/python-modules | |
| parent | b8da5fc4bdd78522d70840ab9a509fe75187c556 (diff) | |
| parent | fd0c467f9671835a71bcaa36439c7f7adfccb126 (diff) | |
| download | nixlib-2356a84bbd91921d93f2be626eb3c7fea2abac58.tar nixlib-2356a84bbd91921d93f2be626eb3c7fea2abac58.tar.gz nixlib-2356a84bbd91921d93f2be626eb3c7fea2abac58.tar.bz2 nixlib-2356a84bbd91921d93f2be626eb3c7fea2abac58.tar.lz nixlib-2356a84bbd91921d93f2be626eb3c7fea2abac58.tar.xz nixlib-2356a84bbd91921d93f2be626eb3c7fea2abac58.tar.zst nixlib-2356a84bbd91921d93f2be626eb3c7fea2abac58.zip | |
Merge pull request #44381 from twhitehead/tensorflow
tensorflow: workaround tensorboard collision due to upstream pip hack
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/tensorflow/bin.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index 4e3621157f93..42e35df7497a 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -61,6 +61,15 @@ in buildPythonPackage rec { # bleach) Hence we disable dependency checking for now. installFlags = lib.optional isPy36 "--no-dependencies"; + + # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow + # and the propageted input tensorflow-tensorboard which causes environment collisions. + # + # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79 + postInstall = '' + rm $out/bin/tensorboard + ''; + # Note that we need to run *after* the fixup phase because the # libraries are loaded at runtime. If we run in preFixup then # patchelf --shrink-rpath will remove the cuda libraries. |