diff options
| author | Robin Gloster <mail@glob.in> | 2017-01-21 13:49:24 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-01-25 20:12:39 +0100 |
| commit | d3cd8b1d58de5ad67e227617ffa2629f04b9e9ac (patch) | |
| tree | a931f3ce4ccef60a028de50016d47802dff41371 /pkgs/development/interpreters | |
| parent | bc08b942e91aa8e4f1a65d68753c928cce84e1e0 (diff) | |
| download | nixlib-d3cd8b1d58de5ad67e227617ffa2629f04b9e9ac.tar nixlib-d3cd8b1d58de5ad67e227617ffa2629f04b9e9ac.tar.gz nixlib-d3cd8b1d58de5ad67e227617ffa2629f04b9e9ac.tar.bz2 nixlib-d3cd8b1d58de5ad67e227617ffa2629f04b9e9ac.tar.lz nixlib-d3cd8b1d58de5ad67e227617ffa2629f04b9e9ac.tar.xz nixlib-d3cd8b1d58de5ad67e227617ffa2629f04b9e9ac.tar.zst nixlib-d3cd8b1d58de5ad67e227617ffa2629f04b9e9ac.zip | |
spidermonkey_1_8_5: add patch to fix build with gcc6
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/1.8.5.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 3c5eef01db01..ed09ac7467d4 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, autoconf213, fetchurl, pkgconfig, nspr, perl, python2, zip }: +{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }: stdenv.mkDerivation rec { name = "spidermonkey-${version}"; @@ -22,7 +22,13 @@ stdenv.mkDerivation rec { ${lib.optionalString stdenv.isArm "autoreconf --verbose --force"} ''; - patches = stdenv.lib.optionals stdenv.isArm [ + patches = [ + (fetchpatch { + name = "gcc6.patch"; + url = "https://anonscm.debian.org/cgit/collab-maint/mozjs.git/plain/debian/patches/fix-811665.patch?id=00b15c7841968ab4f7fec409a6b93fa5e1e1d32e"; + sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99"; + }) + ] ++ stdenv.lib.optionals stdenv.isArm [ # Explained below in configureFlags for ARM ./1.8.5-findvanilla.patch # Fix for hard float flags. |