diff options
author | Edward Tjörnhammar <ed@cflags.cc> | 2016-03-16 13:37:01 +0100 |
---|---|---|
committer | Edward Tjörnhammar <ed@cflags.cc> | 2016-03-16 13:54:44 +0100 |
commit | 929cc074b03cabf81de9a4429408232ef56103e9 (patch) | |
tree | 1819cf0c45764954bff016ef6e2c3247e44c97b6 /pkgs/applications/office | |
parent | 11b69246e017c0f0f70da6913926fb1c96c7a397 (diff) | |
download | nixpkgs-929cc074b03cabf81de9a4429408232ef56103e9.tar nixpkgs-929cc074b03cabf81de9a4429408232ef56103e9.tar.gz nixpkgs-929cc074b03cabf81de9a4429408232ef56103e9.tar.bz2 nixpkgs-929cc074b03cabf81de9a4429408232ef56103e9.tar.lz nixpkgs-929cc074b03cabf81de9a4429408232ef56103e9.tar.xz nixpkgs-929cc074b03cabf81de9a4429408232ef56103e9.tar.zst nixpkgs-929cc074b03cabf81de9a4429408232ef56103e9.zip |
Revert "zotero: patch firefox xpi loading"
Since firefox{,-bin} 45 this patch isn't needed. This reverts commit a6d3b3f97ffe72f84be336aaee02b1be0a04c9dc.
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/zotero/default.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 5939478d695..d74e1ac4b7c 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -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"; |