summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-11-12 08:58:19 +0100
committerVladimír Čunát <vcunat@gmail.com>2017-11-12 09:07:41 +0100
commite3bbc4a503a65588c6c596573bf0dc3b02eb2954 (patch)
treeb547e24102f5b498eaa388f2a5f61e5b7ce905be /pkgs
parent3610d63d72222abf4cc8610e59417f2ab8394b3f (diff)
downloadnixpkgs-e3bbc4a503a65588c6c596573bf0dc3b02eb2954.tar
nixpkgs-e3bbc4a503a65588c6c596573bf0dc3b02eb2954.tar.gz
nixpkgs-e3bbc4a503a65588c6c596573bf0dc3b02eb2954.tar.bz2
nixpkgs-e3bbc4a503a65588c6c596573bf0dc3b02eb2954.tar.lz
nixpkgs-e3bbc4a503a65588c6c596573bf0dc3b02eb2954.tar.xz
nixpkgs-e3bbc4a503a65588c6c596573bf0dc3b02eb2954.tar.zst
nixpkgs-e3bbc4a503a65588c6c596573bf0dc3b02eb2954.zip
spidermonkey-17: fixup build with gcc-7 via Fedora patch
This failed many builds through the polkit dependency.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/interpreters/spidermonkey/17.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/17.nix b/pkgs/development/interpreters/spidermonkey/17.nix
index da5fc193a22..9c47ebe79b6 100644
--- a/pkgs/development/interpreters/spidermonkey/17.nix
+++ b/pkgs/development/interpreters/spidermonkey/17.nix
@@ -18,6 +18,16 @@ stdenv.mkDerivation rec {
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
+  patches = [
+    (fetchurl {
+      name = "jsoptparse-gcc7.patch";
+      url = "https://src.fedoraproject.org/cgit/rpms/mozjs17.git/plain/"
+          + "mozjs17.0.0-gcc7.patch?id=43b846629a299f";
+      sha256 = "17plyaq0jwf9wli4zlgvh4ri3zyk6nj1fiakh3wnd37nsl90raf9";
+    })
+  ];
+  patchFlags = "-p3";
+
   postPatch = ''
     # Fixes an issue with version detection under perl 5.22.x
     sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl