summary refs log tree commit diff
diff options
context:
space:
mode:
authorCasey Ransom <casey@dailykos.com>2018-02-06 17:53:34 -0500
committerCasey Ransom <casey@dailykos.com>2018-02-06 17:54:16 -0500
commit72cd8c09ce17397b66da455381a371bf6d4bd436 (patch)
tree11147ad6259201a7f537ce60ec758e3fccaa4314
parent91eb41b13830a7dd75e900d1bae2a27305b0a517 (diff)
downloadnixlib-72cd8c09ce17397b66da455381a371bf6d4bd436.tar
nixlib-72cd8c09ce17397b66da455381a371bf6d4bd436.tar.gz
nixlib-72cd8c09ce17397b66da455381a371bf6d4bd436.tar.bz2
nixlib-72cd8c09ce17397b66da455381a371bf6d4bd436.tar.lz
nixlib-72cd8c09ce17397b66da455381a371bf6d4bd436.tar.xz
nixlib-72cd8c09ce17397b66da455381a371bf6d4bd436.tar.zst
nixlib-72cd8c09ce17397b66da455381a371bf6d4bd436.zip
v8_3_16_14: fix on darwin
This was switched to use gcc5 for all platforms due to a mkSnapshot
error, which fixes Linux but currently fails for Darwin. I'm unsure if
there are other runtime failures, but this hasn't been building for
quite some time.
-rw-r--r--pkgs/top-level/all-packages.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18717a3780ad..45f976c54046 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11310,7 +11310,7 @@ with pkgs;
   v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
     inherit (python2Packages) python gyp;
     cctools = darwin.cctools;
-    stdenv = overrideCC stdenv gcc5;
+    stdenv = if stdenv.isDarwin then stdenv else overrideCC stdenv gcc5;
   };
 
   v8_6_x = callPackage ../development/libraries/v8/6_x.nix {