Author: kkallio
Date: Fri Dec 17 20:28:51 2010
New Revision: 25186
URL: https://svn.nixos.org/websvn/nix/?rev=25186&sc=1

Log:
Upstream reports bug has been fixed
https://bugzilla.mozilla.org/show_bug.cgi?id=551152
and the patch did not cleanly apply.

Deleted:
   
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/symlinks-bug551152.patch
Modified:
   nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/3.6.nix

Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/3.6.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/3.6.nix Fri Dec 
17 20:28:50 2010        (r25185)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/3.6.nix Fri Dec 
17 20:28:51 2010        (r25186)
@@ -46,10 +46,6 @@
     
     inherit src;
 
-    # To be removed when the change gets upstream. I don't know if the patch
-    # affects xulrunner or firefox.
-    patches = [ ./symlinks-bug551152.patch ];
-
     buildInputs =
       [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
         python dbus dbus_glib pango freetype fontconfig xlibs.libXi
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to