BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "zotero: patch firefox xpi loading"

Browse source 
Since firefox{,-bin} 45 this patch isn't needed.

This reverts commit a6d3b3f97f.
This commit is contained in:
Edward Tjörnhammar 2016-03-16 13:37:01 +01:00
parent 11b69246e0
commit 929cc074b0
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/office/zotero/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, bash, firefox, perl, unzipNLS, xorg }:
{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }:
let
@ -7,14 +7,6 @@ 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
@ -29,9 +21,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ perl unzipNLS ];
inherit bash;
firefox = firefox';
inherit bash firefox;
phases = "unpackPhase installPhase fixupPhase";