about summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers
diff options
context:
space:
mode:
authorJames Cook <james.cook@utoronto.ca>2013-12-13 00:11:52 -0800
committerJames Cook <james.cook@utoronto.ca>2013-12-13 00:11:52 -0800
commit8ddc7b8db26747ef7f0554fa486ba044150ae742 (patch)
tree28eef8160d3fe6c30b10e1a35d29c73f182e22b2 /pkgs/applications/networking/browsers
parentd9f3dab48ebe4614f1813229071eb05578511046 (diff)
firefox: Hack to get it to compile.
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r--pkgs/applications/networking/browsers/firefox/default.nix1
-rw-r--r--pkgs/applications/networking/browsers/firefox/xpidl.patch11
2 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index a48535b9b3275..49c1e5951b6d0 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -143,6 +143,7 @@ rec {
 
     patches = [
       ./disable-reporter.patch # fixes "search box not working when built on xulrunner"
+      ./xpidl.patch
     ];
 
     propagatedBuildInputs = [xulrunner];
diff --git a/pkgs/applications/networking/browsers/firefox/xpidl.patch b/pkgs/applications/networking/browsers/firefox/xpidl.patch
new file mode 100644
index 0000000000000..e6a6b4d826466
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/xpidl.patch
@@ -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)
+