From f13b38344987ae7c9dd6fd746f73ffe010970e13 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 25 Sep 2014 16:16:42 +0200 Subject: [PATCH] Revert "xulrunner: stick to firefox's src attribute" This reverts commit 04369b68199e0cd278c56e70b9f2486f91d1b365. http://hydra.nixos.org/build/14760897 --- pkgs/development/interpreters/xulrunner/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix index 68ee52402204..47dea40eba22 100644 --- a/pkgs/development/interpreters/xulrunner/default.nix +++ b/pkgs/development/interpreters/xulrunner/default.nix @@ -3,18 +3,21 @@ , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu, firefox +, cairo, gstreamer, gst_plugins_base, icu , debugBuild ? false }: assert stdenv.gcc ? libc && stdenv.gcc.libc != null; -let version = firefox.version; in +let version = "31.0"; in stdenv.mkDerivation rec { name = "xulrunner-${version}"; - src = firefox.src; + src = fetchurl { + url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; + sha1 = "a6c3e25ee3aeb7da42db2aaeb50a385d63532beb"; + }; buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2