about summary refs log tree commit diff
path: root/pkgs/applications/office
diff options
context:
space:
mode:
authorEdward Tjörnhammar <ed@cflags.cc>2016-02-29 19:11:38 +0100
committerEdward Tjörnhammar <ed@cflags.cc>2016-02-29 19:11:38 +0100
commita6d3b3f97ffe72f84be336aaee02b1be0a04c9dc (patch)
tree132a9fc2cbd26673357c63b562e7d13fe3655cde /pkgs/applications/office
parent9af50a2e7d735b4a024cb91e2bf720341675031f (diff)
downloadnixlib-a6d3b3f97ffe72f84be336aaee02b1be0a04c9dc.tar
nixlib-a6d3b3f97ffe72f84be336aaee02b1be0a04c9dc.tar.gz
nixlib-a6d3b3f97ffe72f84be336aaee02b1be0a04c9dc.tar.bz2
nixlib-a6d3b3f97ffe72f84be336aaee02b1be0a04c9dc.tar.lz
nixlib-a6d3b3f97ffe72f84be336aaee02b1be0a04c9dc.tar.xz
nixlib-a6d3b3f97ffe72f84be336aaee02b1be0a04c9dc.tar.zst
nixlib-a6d3b3f97ffe72f84be336aaee02b1be0a04c9dc.zip
zotero: patch firefox xpi loading
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r--pkgs/applications/office/zotero/default.nix14
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index d74e1ac4b7c8..5939478d695f 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }:
+{ stdenv, fetchurl, fetchpatch, bash, firefox, perl, unzipNLS, xorg }:
 
 let
 
@@ -7,6 +7,14 @@ let
     sha256 = "02h2ja08v8as4fawj683rh5rmxsjf5d0qmvqa77i176nm20y5s7s";
   };
 
+  firefox' = stdenv.lib.overrideDerivation (firefox) (attrs: {
+    patches = [ (fetchpatch {
+      url = "https://hg.mozilla.org/releases/mozilla-beta/raw-rev/0558da46f20c";
+      sha256 = "08ibp7hny78x8ywfvrh56z90kf8fjpf04mibdlrwkw4f1vgm3fc3";
+      name = "fix-external-xpi-loader";
+    }) ];
+  });
+
   version = "4.0.28";
 
 in
@@ -21,7 +29,9 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ perl unzipNLS ];
 
-  inherit bash firefox;
+  inherit bash;
+
+  firefox = firefox';
 
   phases = "unpackPhase installPhase fixupPhase";