ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-25 06:38:22 +03:00
Code Issues Projects Releases 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 let
@ -7,14 +7,6 @@ let
sha256 = "02h2ja08v8as4fawj683rh5rmxsjf5d0qmvqa77i176nm20y5s7s"; 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"; version = "4.0.28";
in in
@ -29,9 +21,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ perl unzipNLS ]; nativeBuildInputs = [ perl unzipNLS ];
inherit bash; inherit bash firefox;
firefox = firefox';
phases = "unpackPhase installPhase fixupPhase"; phases = "unpackPhase installPhase fixupPhase";