JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1367 from falsifian/firefox_26

Browse Source 
Firefox 26
This commit is contained in:
Michael Raskin 2013-12-14 22:54:01 -08:00
commit b2223ebf69
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -17,9 +17,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec {
firefoxVersion = "25.0.1";
firefoxVersion = "26.0";
xulVersion = "25.0.1"; # this attribute is used by other packages
xulVersion = "26.0"; # this attribute is used by other packages
src = fetchurl {
@ -29,7 +29,7 @@ rec {
# Fall back to this url for versions not available at releases.mozilla.org.
"http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
];
sha1 = "592ebd242c4839ef0e18707a7e959d8bed2a98f3";
sha1 = "f7c6642d6f62aea8d4eced48dd27aba0634edcd5";
};
commonConfigureFlags =
@ -143,6 +143,7 @@ rec {
patches = [
./disable-reporter.patch # fixes "search box not working when built on xulrunner"
./xpidl.patch
];
propagatedBuildInputs = [xulrunner];

11
pkgs/applications/networking/browsers/firefox/xpidl.patch Normal file
View File

@ -0,0 +1,11 @@
--- mozilla-release/python/mozbuild/mozbuild/backend/recursivemake.py 2013-12-05 08:07:53.000000000 -0800
+++ mozilla-release_1/python/mozbuild/mozbuild/backend/recursivemake.py 2013-12-12 23:38:39.697318563 -0800
@@ -421,7 +421,7 @@
def _handle_idl_manager(self, manager):
build_files = self._purge_manifests['xpidl']
- for p in ('Makefile', 'backend.mk', '.deps/.mkdir.done',
+ for p in ('Makefile.in', 'Makefile', 'backend.mk', '.deps/.mkdir.done',
'xpt/.mkdir.done'):
build_files.add(p)