Merge #12299: make firefox-like browsers wrapped by default

This commit is contained in:
Vladimír Čunát
2016-01-15 08:44:38 +01:00
7 changed files with 118 additions and 93 deletions

View File

@@ -3,18 +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, firefox
, cairo, gstreamer, gst_plugins_base, icu, firefox-unwrapped
, debugBuild ? false
}:
assert stdenv.cc ? libc && stdenv.cc.libc != null;
let version = firefox.version; in
let version = firefox-unwrapped.version; in
stdenv.mkDerivation rec {
name = "xulrunner-${version}";
src = firefox.src;
src = firefox-unwrapped.src;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2