Author: raskin
Date: Mon Aug 22 06:54:03 2011
New Revision: 28732
URL: https://svn.nixos.org/websvn/nix/?rev=28732&sc=1
Log:
Adding Firefox 7.0beta1 - with a hack for Linux 3.0 build, but unlike 6.0 it
does work afterwards
Added:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/7.0.nix
- copied, changed from r28707,
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/7.0.nix (from
r28707, nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/6.0.nix Sat Aug
20 06:47:13 2011 (r28707, copy source)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/7.0.nix Mon Aug
22 06:54:03 2011 (r28732)
@@ -15,16 +15,15 @@
rec {
- firefoxVersion = "6.0";
+ firefoxVersion = "7.0b1";
- xulVersion = "6.0"; # this attribute is used by other packages
+ xulVersion = "7.0"; # 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";;
- sha256 = "0ws96gc1mkmilgsikirhmqc6s7m0bcyh58820l08wd82r9abagyc";
+ url =
"http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";;
+ sha256 = "0s8lv07nggdf8ad2yx7sgq1mfy1dvzir0f6x4km911yc9qyhwmwk";
};
-
commonConfigureFlags =
[ "--enable-optimize"
@@ -56,8 +55,8 @@
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
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.libXScrnSaver xlibs.scrnsaverproto
+ xlibs.libXext xlibs.xextproto sqlite
];
configureFlags =
@@ -74,6 +73,12 @@
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}"
'';
# !!! Temporary hack.
@@ -100,9 +105,13 @@
for i in $out/lib/$libDir/*; do
file $i;
if file $i | grep executable &>/dev/null; then
- ln -s $i $out/bin
+ echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename
"$i")";
+ chmod a+x "$out/bin/$(basename "$i")";
fi;
done;
+ for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do
+ patchelf --set-rpath "$(patchelf --print-rpath
"$i"):$out/lib/$libDir" $i || true
+ done;
rm -f $out/bin/run-mozilla.sh
''; # */
@@ -125,7 +134,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
+ xlibs.pixman yasm mesa sqlite file
];
propagatedBuildInputs = [xulrunner];
@@ -134,6 +143,7 @@
[ "--enable-application=browser"
"--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
"--enable-chrome-format=jar"
+ "--disable-elf-hack"
]
++ commonConfigureFlags
++ stdenv.lib.optional enableOfficialBranding
"--enable-official-branding";
@@ -150,6 +160,15 @@
postInstall =
''
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo
$out/lib/firefox-*)/xulrunner
+ for j in $out/bin/*; do
+ i="$(readlink "$j")";
+ file $i;
+ if file $i | grep executable &>/dev/null; then
+ rm "$out/bin/$(basename "$i")"
+ echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename
"$i")"
+ chmod a+x "$out/bin/$(basename "$i")"
+ fi;
+ done;
''; # */
meta = {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Aug 21 21:34:17
2011 (r28731)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Aug 22 06:54:03
2011 (r28732)
@@ -6493,6 +6493,13 @@
firefox60Wrapper = lowPrio (wrapFirefox firefox60Pkgs.firefox "firefox" "");
+ firefox70b1Pkgs = callPackage
../applications/networking/browsers/firefox/7.0.nix {
+ inherit (gtkLibs) gtk pango;
+ inherit (gnome) libIDL;
+ };
+
+ firefox70b1Wrapper = lowPrio (wrapFirefox firefox70b1Pkgs.firefox "firefox"
"");
+
flac = callPackage ../applications/audio/flac { };
flashplayer = flashplayer10;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
