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

Merge pull request #29783 from catern/ffkrb

Browse Source 
firefox: add Kerberos support
This commit is contained in:
Jörg Thalheim 2017-10-14 18:06:00 +01:00 committed by GitHub
commit fe36e9aefa
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -16,6 +16,7 @@
, gstreamer , gstreamer
, gtk2 , gtk2
, gtk3 , gtk3
, kerberos
, libX11 , libX11
, libXScrnSaver , libXScrnSaver
, libxcb , libxcb
@ -100,6 +101,7 @@ stdenv.mkDerivation {
gstreamer gstreamer
gtk2 gtk2
gtk3 gtk3
kerberos
libX11 libX11
libXScrnSaver libXScrnSaver
libXcomposite libXcomposite
@ -168,6 +170,7 @@ stdenv.mkDerivation {
''; '';
passthru.ffmpegSupport = true; passthru.ffmpegSupport = true;
passthru.gssSupport = true;
passthru.updateScript = import ./update.nix { passthru.updateScript = import ./update.nix {
inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl; inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl;
baseUrl = baseUrl =

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

@ -19,6 +19,7 @@
, pulseaudioSupport ? true, libpulseaudio , pulseaudioSupport ? true, libpulseaudio
, ffmpegSupport ? true, gstreamer, gst-plugins-base , ffmpegSupport ? true, gstreamer, gst-plugins-base
, gtk3Support ? !isTorBrowserLike, gtk2, gtk3, wrapGAppsHook , gtk3Support ? !isTorBrowserLike, gtk2, gtk3, wrapGAppsHook
, gssSupport ? true, kerberos
## privacy-related options ## privacy-related options
@ -72,7 +73,8 @@ stdenv.mkDerivation (rec {
++ lib.optional alsaSupport alsaLib ++ lib.optional alsaSupport alsaLib
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ] ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ]
++ lib.optional gtk3Support gtk3; ++ lib.optional gtk3Support gtk3
++ lib.optional gssSupport kerberos;
NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss";
@ -155,6 +157,7 @@ stdenv.mkDerivation (rec {
++ flag alsaSupport "alsa" ++ flag alsaSupport "alsa"
++ flag pulseaudioSupport "pulseaudio" ++ flag pulseaudioSupport "pulseaudio"
++ flag ffmpegSupport "ffmpeg" ++ flag ffmpegSupport "ffmpeg"
++ flag gssSupport "negotiateauth"
++ lib.optional (!ffmpegSupport) "--disable-gstreamer" ++ lib.optional (!ffmpegSupport) "--disable-gstreamer"
++ flag webrtcSupport "webrtc" ++ flag webrtcSupport "webrtc"
++ flag geolocationSupport "mozril-geoloc" ++ flag geolocationSupport "mozril-geoloc"
@ -219,6 +222,7 @@ stdenv.mkDerivation (rec {
gtk = gtk2; gtk = gtk2;
inherit nspr; inherit nspr;
inherit ffmpegSupport; inherit ffmpegSupport;
inherit gssSupport;
} // lib.optionalAttrs gtk3Support { inherit gtk3; }; } // lib.optionalAttrs gtk3Support { inherit gtk3; };
} // overrides) } // overrides)

1
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -113,6 +113,7 @@ in rec {
} // commonAttrs) { } // commonAttrs) {
stdenv = overrideCC stdenv gcc5; stdenv = overrideCC stdenv gcc5;
ffmpegSupport = false; ffmpegSupport = false;
gssSupport = false;
}; };
tor-browser-7-0 = common (rec { tor-browser-7-0 = common (rec {

3
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -9,6 +9,7 @@
, esteidfirefoxplugin , esteidfirefoxplugin
, vlc_npapi , vlc_npapi
, libudev , libudev
, kerberos
}: }:
## configurability of the wrapper itself ## configurability of the wrapper itself
@ -25,6 +26,7 @@ let
cfg = stdenv.lib.attrByPath [ browserName ] {} config; cfg = stdenv.lib.attrByPath [ browserName ] {} config;
enableAdobeFlash = cfg.enableAdobeFlash or false; enableAdobeFlash = cfg.enableAdobeFlash or false;
ffmpegSupport = browser.ffmpegSupport or false; ffmpegSupport = browser.ffmpegSupport or false;
gssSupport = browser.gssSupport or false;
jre = cfg.jre or false; jre = cfg.jre or false;
icedtea = cfg.icedtea or false; icedtea = cfg.icedtea or false;
@ -46,6 +48,7 @@ let
++ lib.optional (cfg.enableVLC or false) vlc_npapi ++ lib.optional (cfg.enableVLC or false) vlc_npapi
); );
libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])
++ lib.optional gssSupport kerberos
++ lib.optionals (cfg.enableQuakeLive or false) ++ lib.optionals (cfg.enableQuakeLive or false)
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ])
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash