public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firefox: Update to 15.0.1

Browse Source 
Also untabified the expression.
This commit is contained in:
Eelco Dolstra 2012-09-11 13:44:49 -04:00
parent fcd30ecfc1
commit b1ce15f77b
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkgs/applications/networking/browsers/firefox/15.0.nix
View File

@ -15,16 +15,16 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
rec { rec {
firefoxVersion = "15.0"; firefoxVersion = "15.0.1";
xulVersion = "15.0"; # this attribute is used by other packages xulVersion = "15.0.1"; # this attribute is used by other packages
src = fetchurl { src = fetchurl {
url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
sha256 = "12f7dgcksb9d79hj0a8lxn3s81id6l2gd1pb7ls4d60kmgbg05jl"; sha1 = "bdbc4b6656c59b926e18f99b3335484427d08641";
}; };
commonConfigureFlags = commonConfigureFlags =
[ "--enable-optimize" [ "--enable-optimize"
"--disable-debug" "--disable-debug"
@ -40,14 +40,14 @@ rec {
"--disable-crashreporter" "--disable-crashreporter"
"--disable-tests" "--disable-tests"
"--disable-necko-wifi" # maybe we want to enable this at some point "--disable-necko-wifi" # maybe we want to enable this at some point
"--disable-installer" "--disable-installer"
"--disable-updater" "--disable-updater"
]; ];
xulrunner = stdenv.mkDerivation rec { xulrunner = stdenv.mkDerivation rec {
name = "xulrunner-${xulVersion}"; name = "xulrunner-${xulVersion}";
inherit src; inherit src;
buildInputs = buildInputs =
@ -65,7 +65,7 @@ rec {
] ++ commonConfigureFlags; ] ++ commonConfigureFlags;
enableParallelBuilding = true; enableParallelBuilding = true;
preConfigure = preConfigure =
'' ''
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
@ -85,9 +85,9 @@ rec {
cd $out/bin cd $out/bin
rm xulrunner rm xulrunner
for i in $out/lib/$libDir/*; do for i in $out/lib/$libDir/*; do
file $i; file $i;
if file $i | grep executable &>/dev/null; then if file $i | grep executable &>/dev/null; then
echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"; echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
chmod a+x "$out/bin/$(basename "$i")"; chmod a+x "$out/bin/$(basename "$i")";
fi; fi;
@ -116,7 +116,7 @@ rec {
inherit src; inherit src;
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
@ -142,7 +142,7 @@ rec {
preConfigure = preConfigure =
'' ''
find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${
stdenv.lib.concatStringsSep ":" stdenv.lib.concatStringsSep ":"
(map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
}' ';' }' ';'
''; '';
@ -150,19 +150,19 @@ rec {
postInstall = postInstall =
'' ''
ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
for j in $out/bin/*; do for j in $out/bin/*; do
i="$(readlink "$j")"; i="$(readlink "$j")";
file $i; file $i;
if file $i | grep executable &>/dev/null; then if file $i | grep executable &>/dev/null; then
rm "$out/bin/$(basename "$i")" rm "$out/bin/$(basename "$i")"
echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")" echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
chmod a+x "$out/bin/$(basename "$i")" chmod a+x "$out/bin/$(basename "$i")"
fi; fi;
done; done;
cd "$out/lib/"firefox-* cd "$out/lib/"firefox-*
rm firefox rm firefox
echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox
chmod a+x firefox chmod a+x firefox
''; # */ ''; # */
meta = { meta = {