diff options
author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2014-10-22 16:19:05 +0200 |
---|---|---|
committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2014-10-22 16:20:43 +0200 |
commit | 2140adf11fe72d9f1370f262b1373af6ff4f8a3a (patch) | |
tree | b9b368ed6b138c7fb32d8eb141a663a7e08a0004 | |
parent | bb8500393bd27a528a63a3eba9f826b2b8e8d7ce (diff) | |
download | nixlib-2140adf11fe72d9f1370f262b1373af6ff4f8a3a.tar nixlib-2140adf11fe72d9f1370f262b1373af6ff4f8a3a.tar.gz nixlib-2140adf11fe72d9f1370f262b1373af6ff4f8a3a.tar.bz2 nixlib-2140adf11fe72d9f1370f262b1373af6ff4f8a3a.tar.lz nixlib-2140adf11fe72d9f1370f262b1373af6ff4f8a3a.tar.xz nixlib-2140adf11fe72d9f1370f262b1373af6ff4f8a3a.tar.zst nixlib-2140adf11fe72d9f1370f262b1373af6ff4f8a3a.zip |
Revert "Revert "xulrunner: stick to firefox's src attribute""
This reverts commit f13b38344987ae7c9dd6fd746f73ffe010970e13.
-rw-r--r-- | pkgs/development/interpreters/xulrunner/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix index 47dea40eba22..68ee52402204 100644 --- a/pkgs/development/interpreters/xulrunner/default.nix +++ b/pkgs/development/interpreters/xulrunner/default.nix @@ -3,21 +3,18 @@ , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu +, cairo, gstreamer, gst_plugins_base, icu, firefox , debugBuild ? false }: assert stdenv.gcc ? libc && stdenv.gcc.libc != null; -let version = "31.0"; in +let version = firefox.version; in stdenv.mkDerivation rec { name = "xulrunner-${version}"; - src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "a6c3e25ee3aeb7da42db2aaeb50a385d63532beb"; - }; + src = firefox.src; buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 |