diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-02-29 14:24:42 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-02-29 14:24:42 -0600 |
| commit | c23874deda69a9c53d329f1b15a965bef3c0eae5 (patch) | |
| tree | 3d80523ee2beecbbba2bd183315dc35329b308e5 | |
| parent | b82c8e3cd44c5ad97624dd21f9e7d431e7d283ff (diff) | |
| parent | a6d3b3f97ffe72f84be336aaee02b1be0a04c9dc (diff) | |
| download | nixlib-c23874deda69a9c53d329f1b15a965bef3c0eae5.tar nixlib-c23874deda69a9c53d329f1b15a965bef3c0eae5.tar.gz nixlib-c23874deda69a9c53d329f1b15a965bef3c0eae5.tar.bz2 nixlib-c23874deda69a9c53d329f1b15a965bef3c0eae5.tar.lz nixlib-c23874deda69a9c53d329f1b15a965bef3c0eae5.tar.xz nixlib-c23874deda69a9c53d329f1b15a965bef3c0eae5.tar.zst nixlib-c23874deda69a9c53d329f1b15a965bef3c0eae5.zip | |
Merge pull request #13577 from edwtjo/zotero-xpi-loader
zotero: patch firefox xpi loading
| -rw-r--r-- | pkgs/applications/office/zotero/default.nix | 14 |
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"; |