public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spidermonkey_1_8_5: add patch to fix build with gcc6

Browse Source
This commit is contained in:
Robin Gloster 2017-01-21 13:49:24 +01:00
parent 1ce3d0b97e
commit 3bc2154f99
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/interpreters/spidermonkey/1.8.5.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "spidermonkey-${version}"; name = "spidermonkey-${version}";
@ -22,7 +22,13 @@ stdenv.mkDerivation rec {
${lib.optionalString stdenv.isArm "autoreconf --verbose --force"} ${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 # Explained below in configureFlags for ARM
./1.8.5-findvanilla.patch ./1.8.5-findvanilla.patch
# Fix for hard float flags. # Fix for hard float flags.