diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-09 19:55:02 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-09 20:21:45 -0400 |
| commit | 86e5595dda4c3f64819ca5c3b13dce7f90b8cde6 (patch) | |
| tree | 25523603f7e7566251ec2e1068d72f7eb7741d3d /pkgs | |
| parent | 1aaab72291394d2aee14818f819e22974026426c (diff) | |
| download | nixlib-86e5595dda4c3f64819ca5c3b13dce7f90b8cde6.tar nixlib-86e5595dda4c3f64819ca5c3b13dce7f90b8cde6.tar.gz nixlib-86e5595dda4c3f64819ca5c3b13dce7f90b8cde6.tar.bz2 nixlib-86e5595dda4c3f64819ca5c3b13dce7f90b8cde6.tar.lz nixlib-86e5595dda4c3f64819ca5c3b13dce7f90b8cde6.tar.xz nixlib-86e5595dda4c3f64819ca5c3b13dce7f90b8cde6.tar.zst nixlib-86e5595dda4c3f64819ca5c3b13dce7f90b8cde6.zip | |
spidermonkey: fix i686 error on 38
spidermonkey doesn’t compile correctly on i686 linux & gcc7. It gives the error: with gcc-7: undefined reference to `__divmoddi4'
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f09e321d3b15..bc48df43f404 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7505,9 +7505,11 @@ with pkgs; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { }; - spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { + spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; - }; + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + })); spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { }; spidermonkey = spidermonkey_31; |