diff options
| author | taku0 <mxxouy6x3m_github@tatapa.org> | 2018-03-14 21:02:24 +0900 |
|---|---|---|
| committer | taku0 <mxxouy6x3m_github@tatapa.org> | 2018-03-16 23:17:07 +0900 |
| commit | 8170c05afc580db5fbdf7907e4e9666b611b1767 (patch) | |
| tree | e6c50c5d75a8df9ea4b28373cfc101dcba4489ff /pkgs/applications/networking/browsers | |
| parent | 186de9ca9ef5650180f2f0cf0a9efdc7dfb16e2e (diff) | |
| download | nixlib-8170c05afc580db5fbdf7907e4e9666b611b1767.tar nixlib-8170c05afc580db5fbdf7907e4e9666b611b1767.tar.gz nixlib-8170c05afc580db5fbdf7907e4e9666b611b1767.tar.bz2 nixlib-8170c05afc580db5fbdf7907e4e9666b611b1767.tar.lz nixlib-8170c05afc580db5fbdf7907e4e9666b611b1767.tar.xz nixlib-8170c05afc580db5fbdf7907e4e9666b611b1767.tar.zst nixlib-8170c05afc580db5fbdf7907e4e9666b611b1767.zip | |
firefox: 58.0.2 -> 59.0
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/packages.nix | 21 |
2 files changed, 7 insertions, 20 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index a70b554c850d..e8e1862d7f83 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -221,7 +221,7 @@ stdenv.mkDerivation (rec { postInstall = '' # For grsecurity kernels - paxmark m $out/lib/firefox-[0-9]*/{firefox,firefox-bin,plugin-container} + paxmark m $out/lib/firefox*/{firefox,firefox-bin,plugin-container} # Remove SDK cruft. FIXME: move to a separate output? rm -rf $out/share/idl $out/include $out/lib/firefox-devel-* @@ -233,8 +233,8 @@ stdenv.mkDerivation (rec { postFixup = '' # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712. patchelf --set-rpath "${lib.getLib libnotify - }/lib:$(patchelf --print-rpath "$out"/lib/firefox-*/libxul.so)" \ - "$out"/lib/firefox-*/libxul.so + }/lib:$(patchelf --print-rpath "$out"/lib/firefox*/libxul.so)" \ + "$out"/lib/firefox*/libxul.so ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 465b4d1b85e1..8b41bf1c95a3 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -18,28 +18,15 @@ rec { firefox = common rec { pname = "firefox"; - version = "58.0.2"; + version = "59.0"; src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "ff748780492fc66b3e44c7e7641f16206e4c09514224c62d37efac2c59877bdf428a3670bfb50407166d7b505d4e2ea020626fd776b87f6abb6bc5d2e54c773f"; + url = "https://hg.mozilla.org/releases/mozilla-release/archive/c61f5f5ead48c78a80c80db5c489bdc7cfaf8175.tar.bz2"; + sha512 = "03yybi1yp9g29jzdfgrq32r7a0gl2jz64w6ai8219cvhx8y95ahxfznj3vm29frrp6c18dk2nlpv2s89iczwm00lnn42r7dn6s6ppl9"; }; patches = nixpkgsPatches ++ [ ./no-buildconfig.patch - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1430274 - # Scheduled for firefox 59 - (fetchpatch { - url = "https://bug1430274.bmoattachments.org/attachment.cgi?id=8943426"; - sha256 = "12yfss3k61yilrb337dh2rffy5hh83d2f16gqrf5i56r9c33f7hf"; - }) - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1388981 - # Should have been fixed in firefox 57 - ] ++ lib.optional stdenv.isi686 (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37"; - sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7"; - }); + ]; meta = { description = "A web browser built from Firefox source tree"; |