From f823626fd8534d8a8b539d083b4712a1aad21190 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 27 Aug 2011 13:44:36 +0000 Subject: [PATCH] * Get Firefox 6.0 to build with an upstream patch for building Firefox separately from Xulrunner (https://bugzilla.mozilla.org/show_bug.cgi?id=639554). svn path=/nixpkgs/trunk/; revision=28846 --- .../firefox/6.0-install-sdk-bin.patch | 35 +++++++++++++++++++ .../networking/browsers/firefox/6.0.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch diff --git a/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch b/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch new file mode 100644 index 000000000000..30fe15c6e483 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch @@ -0,0 +1,35 @@ + +# HG changeset patch +# User Chris Coulson +# Date 1306390403 -7200 +# Node ID 99672871e93003520189cfe3a684ebbea151cb4b +# Parent 831f8e040f381ed58441d8bf413f9845f26ce08e +Bug 639554 - Install sdk/bin with make install. r=bsmedberg + +diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk +--- a/toolkit/mozapps/installer/packager.mk ++++ b/toolkit/mozapps/installer/packager.mk +@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard + $(NSINSTALL) -D $(DESTDIR)$(includedir) + (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DESTDIR)$(includedir) && tar -xf -) + $(NSINSTALL) -D $(DESTDIR)$(idldir) + (cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DESTDIR)$(idldir) && tar -xf -) + # SDK directory is the libs + a bunch of symlinks + $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib ++ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin + if test -f $(DIST)/include/xpcom-config.h; then \ + $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \ + fi + (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -) ++ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -) + $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl + ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib + ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin + ln -s $(includedir) $(DESTDIR)$(sdkdir)/include + ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl + endif # INSTALL_SDK + + make-sdk: + diff --git a/pkgs/applications/networking/browsers/firefox/6.0.nix b/pkgs/applications/networking/browsers/firefox/6.0.nix index 7535cfb201ef..7de26f0c521e 100644 --- a/pkgs/applications/networking/browsers/firefox/6.0.nix +++ b/pkgs/applications/networking/browsers/firefox/6.0.nix @@ -51,6 +51,8 @@ rec { inherit src; + patches = [ ./6.0-install-sdk-bin.patch ]; + buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig xlibs.libXi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b79ecf611a57..3b1cbcf2d0d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6449,7 +6449,7 @@ let firefoxWrapper = wrapFirefox pkgs.firefox "firefox" ""; - firefoxPkgs = pkgs.firefox50Pkgs; + firefoxPkgs = pkgs.firefox60Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gtkLibs) gtk pango; @@ -6470,7 +6470,7 @@ let inherit (gnome) libIDL; }; - firefox60Wrapper = lowPrio (wrapFirefox firefox60Pkgs.firefox "firefox" ""); + firefox60Wrapper = wrapFirefox firefox60Pkgs.firefox "firefox" ""; firefox70b1Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix { inherit (gtkLibs) gtk pango;