diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 75cd0d771d71..22f2220d30c2 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -344,84 +344,89 @@ let
     ++ lib.optionals mklSupport [ mkl ]
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ nsync ];
 
-    # arbitrarily set to the current latest bazel version, overly careful
-    TF_IGNORE_MAX_BAZEL_VERSION = true;
+    env = {
+      # arbitrarily set to the current latest bazel version, overly careful
+      TF_IGNORE_MAX_BAZEL_VERSION = true;
 
-    LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool";
+      LIBTOOL = lib.optionalString stdenv.hostPlatform.isDarwin "${cctools}/bin/libtool";
 
-    # Take as many libraries from the system as possible. Keep in sync with
-    # list of valid syslibs in
-    # https://github.com/tensorflow/tensorflow/blob/master/third_party/systemlibs/syslibs_configure.bzl
-    TF_SYSTEM_LIBS = lib.concatStringsSep "," (
-      [
-        "absl_py"
-        "astor_archive"
-        "astunparse_archive"
-        "boringssl"
-        "com_google_absl"
-        # Not packaged in nixpkgs
-        # "com_github_googleapis_googleapis"
-        # "com_github_googlecloudplatform_google_cloud_cpp"
-        "com_github_grpc_grpc"
-        "com_google_protobuf"
-        # Fails with the error: external/org_tensorflow/tensorflow/core/profiler/utils/tf_op_utils.cc:46:49: error: no matching function for call to 're2::RE2::FullMatch(absl::lts_2020_02_25::string_view&, re2::RE2&)'
-        # "com_googlesource_code_re2"
-        "curl"
-        "cython"
-        "dill_archive"
-        "double_conversion"
-        "flatbuffers"
-        "functools32_archive"
-        "gast_archive"
-        "gif"
-        "hwloc"
-        "icu"
-        "jsoncpp_git"
-        "libjpeg_turbo"
-        "nasm"
-        "opt_einsum_archive"
-        "org_sqlite"
-        "pasta"
-        "png"
-        "pybind11"
-        "six_archive"
-        "snappy"
-        "tblib_archive"
-        "termcolor_archive"
-        "typing_extensions_archive"
-        "wrapt"
-        "zlib"
-      ]
-      ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-        "nsync" # fails to build on darwin
-      ]
-    );
+      # Take as many libraries from the system as possible. Keep in sync with
+      # list of valid syslibs in
+      # https://github.com/tensorflow/tensorflow/blob/master/third_party/systemlibs/syslibs_configure.bzl
+      TF_SYSTEM_LIBS = lib.concatStringsSep "," (
+        [
+          "absl_py"
+          "astor_archive"
+          "astunparse_archive"
+          "boringssl"
+          "com_google_absl"
+          # Not packaged in nixpkgs
+          # "com_github_googleapis_googleapis"
+          # "com_github_googlecloudplatform_google_cloud_cpp"
+          "com_github_grpc_grpc"
+          "com_google_protobuf"
+          # Fails with the error: external/org_tensorflow/tensorflow/core/profiler/utils/tf_op_utils.cc:46:49: error: no matching function for call to 're2::RE2::FullMatch(absl::lts_2020_02_25::string_view&, re2::RE2&)'
+          # "com_googlesource_code_re2"
+          "curl"
+          "cython"
+          "dill_archive"
+          "double_conversion"
+          "flatbuffers"
+          "functools32_archive"
+          "gast_archive"
+          "gif"
+          "hwloc"
+          "icu"
+          "jsoncpp_git"
+          "libjpeg_turbo"
+          "nasm"
+          "opt_einsum_archive"
+          "org_sqlite"
+          "pasta"
+          "png"
+          "pybind11"
+          "six_archive"
+          "snappy"
+          "tblib_archive"
+          "termcolor_archive"
+          "typing_extensions_archive"
+          "wrapt"
+          "zlib"
+        ]
+        ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+          "nsync" # fails to build on darwin
+        ]
+      );
 
-    INCLUDEDIR = "${includes_joined}/include";
+      INCLUDEDIR = "${includes_joined}/include";
 
-    # This is needed for the Nix-provided protobuf dependency to work,
-    # as otherwise the rule `link_proto_files` tries to create the links
-    # to `/usr/include/...` which results in build failures.
-    PROTOBUF_INCLUDE_PATH = "${protobuf-core}/include";
+      # This is needed for the Nix-provided protobuf dependency to work,
+      # as otherwise the rule `link_proto_files` tries to create the links
+      # to `/usr/include/...` which results in build failures.
+      PROTOBUF_INCLUDE_PATH = "${protobuf-core}/include";
 
-    PYTHON_BIN_PATH = pythonEnv.interpreter;
+      PYTHON_BIN_PATH = pythonEnv.interpreter;
 
-    TF_NEED_GCP = true;
-    TF_NEED_HDFS = true;
-    TF_ENABLE_XLA = tfFeature xlaSupport;
+      TF_NEED_GCP = true;
+      TF_NEED_HDFS = true;
+      TF_ENABLE_XLA = tfFeature xlaSupport;
 
-    CC_OPT_FLAGS = " ";
+      CC_OPT_FLAGS = " ";
 
-    # https://github.com/tensorflow/tensorflow/issues/14454
-    TF_NEED_MPI = tfFeature cudaSupport;
+      # https://github.com/tensorflow/tensorflow/issues/14454
+      TF_NEED_MPI = tfFeature cudaSupport;
 
-    TF_NEED_CUDA = tfFeature cudaSupport;
-    TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkitDevMerged},${cudnnMerged},${lib.getLib nccl}";
-    TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities;
+      TF_NEED_CUDA = tfFeature cudaSupport;
+      TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkitDevMerged},${cudnnMerged},${lib.getLib nccl}";
+      TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities;
 
-    # Needed even when we override stdenv: e.g. for ar
-    GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin";
-    GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/cc";
+      # Needed even when we override stdenv: e.g. for ar
+      GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin";
+      GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/cc";
+
+      # https://github.com/tensorflow/tensorflow/pull/39470
+      NIX_CFLAGS_COMPILE = toString [ "-Wno-stringop-truncation" ];
+    };
 
     patches = [
       "${gentoo-patches}/0002-systemlib-Latest-absl-LTS-has-split-cord-libs.patch"
@@ -453,9 +458,6 @@ let
       sed -i '/tensorboard ~=/d' tensorflow/tools/pip_package/setup.py
     '';
 
-    # https://github.com/tensorflow/tensorflow/pull/39470
-    env.NIX_CFLAGS_COMPILE = toString [ "-Wno-stringop-truncation" ];
-
     preConfigure =
       let
         opt_flags =