commit 76dc1086dc3f4fe74b7c3866c5768730d39c2a88 · pyrox.dev/nixpkgs

+13 -12
pkgs/applications/networking/browsers/firefox/wrapper.nix
···

       2
       2
        
       , replace, fetchurl, zip, unzip, jq, xdg-utils, writeText

     

       3
       3
        
       

     

       4
       4
        
       ## various stuff that can be plugged in

     

       5
       5
       -
       , flashplayer, hal-flash

     

       6
       5
        
       , ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify

     

       7
       6
        
       , gnome3/*.gnome-shell*/

     

       8
       7
        
       , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire

     
···

       47
       46
        
           assert forceWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used

     

       48
       47
        
       

     

       49
       48
        
           let

     

       50
       50
       -
             enableAdobeFlash = cfg.enableAdobeFlash or false;

     

       51
       49
        
             ffmpegSupport = browser.ffmpegSupport or false;

     

       52
       50
        
             gssSupport = browser.gssSupport or false;

     

       53
       51
        
             alsaSupport = browser.alsaSupport or false;

     

       54
       52
        
             pipewireSupport = browser.pipewireSupport or false;

     

       55
       53
        
       

     

       54
       54
       +
             # FIXME: This should probably be an assertion now?

     

       56
       55
        
             plugins =

     

       57
       56
        
               let

     

       58
       57
        
                 removed = lib.filter (a: builtins.hasAttr a cfg) [

     

       59
       59
       -
                   "enableVLC"

     

       58
       58
       +
                   "enableAdobeFlash"

     

       59
       59
       +
                   "enableAdobeReader"

     

       60
       60
       +
                   "enableBluejeans"

     

       60
       61
        
                   "enableDjvu"

     

       62
       62
       +
                   "enableFriBIDPlugin"

     

       63
       63
       +
                   "enableGoogleTalkPlugin"

     

       61
       64
        
                   "enableMPlayer"

     

       62
       62
       -
                   "jre"

     

       65
       65
       +
                   "enableVLC"

     

       63
       66
        
                   "icedtea"

     

       64
       64
       -
                   "enableGoogleTalkPlugin"

     

       65
       65
       -
                   "enableFriBIDPlugin"

     

       66
       66
       -
                   "enableBluejeans"

     

       67
       67
       -
                   "enableAdobeReader"

     

       67
       67
       +
                   "jre"

     

       68
       68
        
                 ];

     

       69
       69
       -
               in if removed != []

     

       70
       70
       -
                  then throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options, except for the adobe flash player, have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."

     

       71
       71
       -
                  else lib.optional enableAdobeFlash flashplayer;

     

       69
       69
       +
               in if removed != [] then

     

       70
       70
       +
                 throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."

     

       71
       71
       +
               else

     

       72
       72
       +
                 []

     

       73
       73
       +
               ;

     

       72
       74
        
       

     

       73
       75
        
             nativeMessagingHosts =

     

       74
       76
        
               ([ ]

     
···

       88
       90
        
                   ++ lib.optional useGlvnd libglvnd

     

       89
       91
        
                   ++ lib.optionals (cfg.enableQuakeLive or false)

     

       90
       92
        
                   (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])

     

       91
       91
       -
                   ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash

     

       92
       93
        
                   ++ lib.optional (config.pulseaudio or true) libpulseaudio

     

       93
       94
        
                   ++ lib.optional alsaSupport alsaLib

     

       94
       95
        
                   ++ pkcs11Modules;