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

firefox: refactor into firefoxPackages, add more options

Browse Source
This commit is contained in:
Jan Malakhovski 2017-03-27 12:33:00 +00:00 committed by Michael Raskin
parent 1d407173b0
commit f0f572ff46
3 changed files with 189 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

278
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -1,175 +1,167 @@
{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL { pname, version, updateScript ? null
, src, patches ? [], meta }:
{ lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL
, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , freetype, fontconfig, file, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper , yasm, mesa, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification, libvpx , hunspell, libevent, libstartup_notification, libvpx
, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc, libpulseaudio , cairo, icu, libpng, jemalloc
, autoconf213, which, cargo, rustc , autoconf213, which, gnused, cargo, rustc
, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
, enableGTK3 ? false, gtk3, wrapGAppsHook
, debugBuild ? false , debugBuild ? false
, # If you want the resulting program to call itself "Firefox" instead
# of "Nightly" or whatever, enable this option. However, those ### optionals
# binaries may not be distributed without permission from the
# Mozilla Foundation, see , alsaSupport ? true, alsaLib
# http://www.mozilla.org/foundation/trademarks/. , pulseaudioSupport ? true, libpulseaudio
enableOfficialBranding ? false , ffmpegSupport ? true, gstreamer, gst-plugins-base
, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
, webrtcSupport ? true
, geolocationSupport ? true
, googleAPISupport ? geolocationSupport
, crashreporterSupport ? false
, safeBrowsingSupport ? false
, drmSupport ? false
# If you want the resulting program to call itself "Firefox" instead
# of "Nightly" or whatever, enable this option. However, those
# binaries may not be distributed without permission from the
# Mozilla Foundation, see
# http://www.mozilla.org/foundation/trademarks/.
, enableOfficialBranding ? false
}: }:
assert stdenv.cc ? libc && stdenv.cc.libc != null; assert stdenv.cc ? libc && stdenv.cc.libc != null;
let let
flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
in
common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-unwrapped-${version}"; name = "${pname}-unwrapped-${version}";
src = fetchurl { inherit src patches meta;
url =
let ext = if lib.versionAtLeast version "41.0" then "xz" else "bz2";
in "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.${ext}";
inherit sha512;
};
# this patch should no longer be needed in 53 buildInputs = [
# from https://bugzilla.mozilla.org/show_bug.cgi?id=1013882 gtk2 perl zip libIDL libjpeg zlib bzip2
patches = lib.optional debugBuild ./fix-debug.patch; dbus dbus_glib pango freetype fontconfig xorg.libXi
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
buildInputs = nss nspr libnotify xorg.pixman yasm mesa
[ gtk2 zip libIDL libjpeg zlib bzip2 xorg.libXScrnSaver xorg.scrnsaverproto
dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libXext xorg.xextproto sqlite unzip makeWrapper
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file hunspell libevent libstartup_notification libvpx /* cairo */
alsaLib nspr nss libnotify xorg.pixman yasm mesa icu libpng jemalloc
xorg.libXScrnSaver xorg.scrnsaverproto ]
xorg.libXext xorg.xextproto sqlite unzip ++ lib.optional alsaSupport alsaLib
hunspell libevent libstartup_notification libvpx /* cairo */ ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
icu libpng jemalloc ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ]
libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3;
]
++ lib.optional enableGTK3 gtk3
++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst-plugins-base ];
nativeBuildInputs = nativeBuildInputs =
[ autoconf213 which gnused pkgconfig perl python cargo rustc ] [ autoconf213 which gnused pkgconfig perl python cargo rustc ]
++ lib.optional enableGTK3 wrapGAppsHook; ++ lib.optional gtk3Support wrapGAppsHook;
configureFlags = preConfigure = ''
[ "--enable-application=browser" # remove distributed configuration files
"--with-system-jpeg" rm -f configure
"--with-system-zlib" rm -f js/src/configure
"--with-system-bz2" rm -f .mozconfig*
"--with-system-nspr"
"--with-system-nss" # this will run autoconf213
"--with-system-libevent" make -f client.mk configure-files
"--with-system-libvpx"
"--with-system-png" # needs APNG support configureScript="$(realpath ./configure)"
"--with-system-icu" cd obj-*
"--enable-alsa" '' + lib.optionalString googleAPISupport ''
"--enable-system-ffi" # Google API key used by Chromium and Firefox.
"--enable-system-hunspell" # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution,
"--enable-system-pixman" # please get your own set of keys.
"--enable-system-sqlite" echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" >ga
#"--enable-system-cairo" '';
"--enable-startup-notification"
"--enable-content-sandbox" # available since 26.0, but not much info available configureFlags = [
"--disable-crashreporter" "--enable-application=browser"
"--disable-tests" "--with-system-jpeg"
"--disable-necko-wifi" # maybe we want to enable this at some point "--with-system-zlib"
"--disable-updater" "--with-system-bz2"
"--enable-jemalloc" "--with-system-nspr"
"--disable-gconf" "--with-system-nss"
"--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}" "--with-system-libevent"
"--with-google-api-keyfile=ga" "--with-system-libvpx"
] "--with-system-png" # needs APNG support
++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] "--with-system-icu"
else [ "--disable-debug" "--enable-release" "--enable-system-ffi"
"--enable-optimize" "--enable-system-hunspell"
"--enable-strip" ]) "--enable-system-pixman"
++ lib.optional enableOfficialBranding "--enable-official-branding"; "--enable-system-sqlite"
#"--enable-system-cairo"
"--enable-startup-notification"
"--enable-content-sandbox" # available since 26.0, but not much info available
"--disable-tests"
"--disable-necko-wifi" # maybe we want to enable this at some point
"--disable-updater"
"--enable-jemalloc"
"--disable-maintenance-service"
"--disable-gconf"
"--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}"
]
++ flag alsaSupport "alsa"
++ flag pulseaudioSupport "pulseaudio"
++ flag ffmpegSupport "ffmpeg"
++ lib.optional (!ffmpegSupport) "--disable-gstreamer"
++ flag webrtcSupport "webrtc"
++ flag geolocationSupport "mozril-geoloc"
++ lib.optional googleAPISupport "--with-google-api-keyfile=ga"
++ flag crashreporterSupport "crashreporter"
++ flag safeBrowsingSupport "safe-browsing"
++ flag drmSupport "eme"
++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ]
else [ "--disable-debug" "--enable-release"
"--enable-optimize"
"--enable-strip" ])
++ lib.optional enableOfficialBranding "--enable-official-branding";
enableParallelBuilding = true; enableParallelBuilding = true;
preConfigure = preInstall = ''
'' # The following is needed for startup cache creation on grsecurity kernels.
configureScript="$(realpath ./configure)" paxmark m dist/bin/xpcshell
mkdir ../objdir '';
cd ../objdir
# Google API key used by Chromium and Firefox. postInstall = ''
# Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, # For grsecurity kernels
# please get your own set of keys. paxmark m $out/lib/firefox-[0-9]*/{firefox,firefox-bin,plugin-container}
echo "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI" >ga
'';
preInstall = # Remove SDK cruft. FIXME: move to a separate output?
'' rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
# The following is needed for startup cache creation on grsecurity kernels.
paxmark m ../objdir/dist/bin/xpcshell
'';
postInstall = # Needed to find Mozilla runtime
'' gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped")
# For grsecurity kernels '';
paxmark m $out/lib/firefox-[0-9]*/{firefox,firefox-bin,plugin-container}
# Remove SDK cruft. FIXME: move to a separate output? postFixup = ''
rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
# Needed to find Mozilla runtime
gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped")
'';
postFixup =
# Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712. # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712.
'' patchelf --set-rpath "${lib.getLib libnotify
patchelf --set-rpath "${lib.getLib libnotify }/lib:$(patchelf --print-rpath "$out"/lib/firefox-*/libxul.so)" \
}/lib:$(patchelf --print-rpath "$out"/lib/firefox-*/libxul.so)" \ "$out"/lib/firefox-*/libxul.so
"$out"/lib/firefox-*/libxul.so '';
'';
doInstallCheck = true; doInstallCheck = true;
installCheckPhase = installCheckPhase = ''
'' # Some basic testing
# Some basic testing "$out/bin/firefox" --version
"$out/bin/firefox" --version '';
'';
meta = {
description = "A web browser" + lib.optionalString (pname == "firefox-esr") " (Extended Support Release)";
homepage = http://www.mozilla.com/en-US/firefox/;
maintainers = with lib.maintainers; [ eelco ];
platforms = lib.platforms.linux;
};
passthru = { passthru = {
inherit nspr version updateScript;
gtk = gtk2;
isFirefox3Like = true;
browserName = "firefox"; browserName = "firefox";
ffmpegSupport = lib.versionAtLeast version "46.0"; inherit version updateScript;
isFirefox3Like = true;
gtk = gtk2;
inherit nspr;
inherit ffmpegSupport;
}; };
};
in {
firefox-unwrapped = common {
pname = "firefox";
version = "53.0";
sha512 = "36ec810bab58e3d99478455a38427a5efbc74d6dd7d4bb93b700fd7429b9b89250efd0abe4609091483991802090c6373c8434dfc9ba64c79a778e51fd2a2886";
updateScript = import ./update.nix {
attrPath = "firefox-unwrapped";
inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;
};
};
firefox-esr-unwrapped = common {
pname = "firefox-esr";
version = "52.1.0esr";
sha512 = "ba833904654eda347f83df77e04c8e81572772e8555f187b796ecc30e498b93fb729b6f60935731d9584169adc9d61329155364fddf635cbd11abebe4a600247";
updateScript = import ./update.nix {
attrPath = "firefox-esr-unwrapped";
versionSuffix = "esr";
inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;
};
};
} }

43
pkgs/applications/networking/browsers/firefox/packages.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib, callPackage, fetchurl }:
let common = opts: callPackage (import ./common.nix opts); in
rec {
firefox = common rec {
pname = "firefox";
version = "53.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "36ec810bab58e3d99478455a38427a5efbc74d6dd7d4bb93b700fd7429b9b89250efd0abe4609091483991802090c6373c8434dfc9ba64c79a778e51fd2a2886";
};
meta = {
description = "A web browser built from Firefox source tree";
homepage = http://www.mozilla.com/en-US/firefox/;
maintainers = with lib.maintainers; [ eelco ];
platforms = lib.platforms.linux;
};
updateScript = callPackage ./update.nix {
attrPath = "firefox-unwrapped";
};
} {};
firefox-esr = common rec {
pname = "firefox-esr";
version = "52.1.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "ba833904654eda347f83df77e04c8e81572772e8555f187b796ecc30e498b93fb729b6f60935731d9584169adc9d61329155364fddf635cbd11abebe4a600247";
};
meta = firefox.meta // {
description = "A web browser built from Firefox Extended Support Release source tree";
};
updateScript = callPackage ./update.nix {
attrPath = "firefox-esr-unwrapped";
versionSuffix = "esr";
};
} {};
}

18
pkgs/top-level/all-packages.nix
View File

@ -13776,13 +13776,17 @@ with pkgs;
filezilla = callPackage ../applications/networking/ftp/filezilla { }; filezilla = callPackage ../applications/networking/ftp/filezilla { };
inherit (callPackages ../applications/networking/browsers/firefox { firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {
inherit (gnome2) libIDL; callPackage = pkgs.newScope {
libpng = libpng_apng; inherit (gnome2) libIDL;
enableGTK3 = true; libpng = libpng_apng;
python = python2; python = python2;
gnused = gnused_422; gnused = gnused_422;
}) firefox-unwrapped firefox-esr-unwrapped; };
});
firefox-unwrapped = firefoxPackages.firefox;
firefox-esr-unwrapped = firefoxPackages.firefox-esr;
firefox = wrapFirefox firefox-unwrapped { }; firefox = wrapFirefox firefox-unwrapped { };
firefox-esr = wrapFirefox firefox-esr-unwrapped { }; firefox-esr = wrapFirefox firefox-esr-unwrapped { };