Author: eelco Date: Sat Aug 27 13:44:36 2011 New Revision: 28846 URL: https://svn.nixos.org/websvn/nix/?rev=28846&sc=1
Log: * 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). Added: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Added: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch Sat Aug 27 13:44:36 2011 (r28846) @@ -0,0 +1,35 @@ + +# HG changeset patch +# User Chris Coulson <[email protected]> +# 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: + Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix ============================================================================== --- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix Sat Aug 27 07:27:35 2011 (r28845) +++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix Sat Aug 27 13:44:36 2011 (r28846) @@ -51,6 +51,8 @@ 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 Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 27 07:27:35 2011 (r28845) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 27 13:44:36 2011 (r28846) @@ -6449,7 +6449,7 @@ 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 @@ 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; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
