From 603e3e8c6f5d2e09fff1008e957fc5e73916ec31 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 18 Jun 2009 10:03:07 +0000 Subject: [PATCH] Firefox 3.5 RC1 svn path=/nixpkgs/trunk/; revision=15991 --- .../networking/browsers/firefox-3/3.5.nix | 7 ++----- .../networking/browsers/firefox-3/xulrunner-3.5.nix | 12 +++++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-3/3.5.nix b/pkgs/applications/networking/browsers/firefox-3/3.5.nix index 1915681c5c3..09f2eabe541 100644 --- a/pkgs/applications/networking/browsers/firefox-3/3.5.nix +++ b/pkgs/applications/networking/browsers/firefox-3/3.5.nix @@ -10,15 +10,12 @@ }: -let version = "3.5b99"; in +let version = xulrunner.ffversion; in stdenv.mkDerivation { name = "firefox-${version}"; - src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/firefox/releases/${version}/source/firefox-${version}-source.tar.bz2"; - sha256 = "05vyksprh00asvir3wskjzgxmyvhr89fdh0dwi8s0vknbcbx6hvr"; - }; + src = xulrunner.src; buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 diff --git a/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.5.nix b/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.5.nix index 62e896ea07f..6f998bada9f 100644 --- a/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.5.nix +++ b/pkgs/applications/networking/browsers/firefox-3/xulrunner-3.5.nix @@ -11,17 +11,17 @@ let - version = "1.9.1b99"; # this attribute is used by other packages - ffversion = "3.5b99"; + version = "1.9.1rc1"; # this attribute is used by other packages + ffversion = "3.5rc1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "xulrunner-${version}"; src = fetchurl { url = "ftp://ftp.mozilla.org/pub/firefox/releases/${ffversion}/source/firefox-${ffversion}-source.tar.bz2"; - sha256 = "05vyksprh00asvir3wskjzgxmyvhr89fdh0dwi8s0vknbcbx6hvr"; + sha256 = "14yrkvk0kibfpkcvbb44ww89plhm8iikbqmnc0jbkjr4k70a7gcl"; }; buildInputs = [ @@ -91,7 +91,9 @@ stdenv.mkDerivation { homepage = http://www.mozilla.com/en-US/firefox/; }; - passthru = { inherit gtk version; }; + passthru = { + inherit gtk version ffversion src; + }; }