Author: raskin
Date: Fri Sep 30 15:44:22 2011
New Revision: 29549
URL: https://ssl.nixos.org/websvn/nix/?rev=29549&sc=1
Log:
Adding Firefox 8.0beta1
Added:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/8.0.nix
- copied, changed from r29540,
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/7.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/8.0.nix (from
r29540, nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/7.0.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/7.0.nix Wed Sep
28 23:38:39 2011 (r29540, copy source)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/8.0.nix Fri Sep
30 15:44:22 2011 (r29549)
@@ -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
-, yasm, mesa, sqlite
+, yasm, mesa, sqlite, unzip
, # 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 = "7.0b1";
+ firefoxVersion = "8.0b1";
- xulVersion = "7.0"; # this attribute is used by other packages
+ xulVersion = "8.0"; # this attribute is used by other packages
src = fetchurl {
url =
"http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";;
- sha256 = "0s8lv07nggdf8ad2yx7sgq1mfy1dvzir0f6x4km911yc9qyhwmwk";
+ sha256 = "1sdahpawgngvjh4cap2vdg00ngiwji5nkb40dh5kd393wa6c8mpm";
};
commonConfigureFlags =
@@ -56,7 +56,7 @@
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto
- xlibs.libXext xlibs.xextproto sqlite
+ xlibs.libXext xlibs.xextproto sqlite unzip
];
configureFlags =
@@ -73,10 +73,6 @@
stdenv.lib.concatStringsSep ":"
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
}' ';'
- cp -i security/coreconf/Linux{2.6,3.0}.mk
- cp -i security/coreconf/Linux{2.6,3.1}.mk
- cp -i security/coreconf/Linux{2.6,3.2}.mk
- cp -i security/coreconf/Linux{2.6,3.3}.mk
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
'';
@@ -134,7 +130,7 @@
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
- xlibs.pixman yasm mesa sqlite file
+ xlibs.pixman yasm mesa sqlite file unzip
];
propagatedBuildInputs = [xulrunner];
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Sep 30 15:39:47
2011 (r29548)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Sep 30 15:44:22
2011 (r29549)
@@ -6583,6 +6583,11 @@
firefox70Wrapper = lowPrio (wrapFirefox firefox70Pkgs.firefox "firefox" "");
+ firefox80bPkgs = callPackage
../applications/networking/browsers/firefox/8.0.nix {
+ inherit (gtkLibs) gtk pango;
+ inherit (gnome) libIDL;
+ };
+
flac = callPackage ../applications/audio/flac { };
flashplayer = flashplayer10;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
