Author: raskin
Date: Fri Oct 8 08:28:00 2010
New Revision: 24172
URL: https://svn.nixos.org/websvn/nix/?rev=24172&sc=1
Log:
Add FF4.0 beta 6
Added:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix
- copied, changed from r24148,
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/3.6.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix (from
r24148, nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/3.6.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/3.6.nix Thu Oct
7 16:58:07 2010 (r24148, copy source)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix Fri Oct
8 08:28:00 2010 (r24172)
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
+, libvpx, yasm
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those
@@ -12,14 +13,14 @@
rec {
- firefoxVersion = "3.6.10";
+ firefoxVersion = "4.0b6";
- xulVersion = "1.9.2.10"; # this attribute is used by other packages
+ xulVersion = "2.0b6"; # this attribute is used by other packages
src = fetchurl {
url =
"http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";;
- sha1 = "0fa17f4ebd4bafe18c789961bdfe064d1b521ac6";
+ sha256 = "1ssgb41h43kbf012iwdybf9kp2gfqkg3icf81dg8ibwr2cd0kmz2";
};
@@ -46,15 +47,11 @@
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
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
- alsaLib nspr /* nss */ libnotify xlibs.pixman
+ alsaLib nspr /* nss */ libnotify xlibs.pixman libvpx yasm
];
configureFlags =
@@ -105,14 +102,10 @@
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 zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
- xlibs.pixman
+ xlibs.pixman libvpx yasm
];
propagatedBuildInputs = [xulrunner];
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Oct 8 06:53:35
2010 (r24171)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Oct 8 08:28:00
2010 (r24172)
@@ -5572,6 +5572,11 @@
inherit (gnome) libIDL;
};
+ firefox40Pkgs = callPackage
../applications/networking/browsers/firefox/4.0.nix {
+ inherit (gtkLibs) gtk pango;
+ inherit (gnome) libIDL;
+ };
+
firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" "";
flac = callPackage ../applications/audio/flac { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
