Author: eelco
Date: Mon May 2 11:53:11 2011
New Revision: 27089
URL: https://svn.nixos.org/websvn/nix/?rev=27089&sc=1
Log:
* Firefox updated to 4.0.1. Dropped the libvpx dependency because it
was ignored anyway. With the --with-system-libvpx flag, the build
barfs with:
checking for vpx/vpx_decoder.h... yes
configure: error: vpx/vpx_decoder.h found, but is not in /usr/include
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix Mon May
2 11:52:24 2011 (r27088)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix Mon May
2 11:53:11 2011 (r27089)
@@ -1,7 +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, mesa
+, yasm, mesa
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those
@@ -15,14 +15,14 @@
rec {
- firefoxVersion = "4.0";
+ firefoxVersion = "4.0.1";
- xulVersion = "2.0"; # this attribute is used by other packages
+ xulVersion = "2.0.1"; # 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 = "403da9dd65662e5c4dd34299214e04cb6f80575e";
+ sha1 = "c89bc5106266aa0097a7be15be84555bd2649f03";
};
@@ -58,7 +58,7 @@
[ 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 libvpx yasm mesa
+ alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto
xlibs.libXext xlibs.xextproto
];
@@ -128,7 +128,7 @@
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
- xlibs.pixman libvpx yasm mesa
+ xlibs.pixman yasm mesa
];
propagatedBuildInputs = [xulrunner];
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
