about summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers
diff options
context:
space:
mode:
authorRobert Helgesson <robert@rycee.net>2019-06-25 22:17:21 +0200
committerRobert Helgesson <robert@rycee.net>2019-07-09 00:56:24 +0200
commit06d8666a60174dd3083d1516f9f405251601f476 (patch)
tree3b1f63eaf08a373c5e4401150999245d0542365f /pkgs/applications/networking/browsers
parent13b815603077abd0bcfcf412f9fbb28df2320ff3 (diff)
firefox: allow overriding config of wrapped package
By moving the `cfg` variable into the wrapper arguments we are able to
override it for an already wrapped package. For example, with this
change one can have

    pkgs.firefox-devedition-bin.override {
      cfg.enableBrowserpass = true;
    }

which would otherwise be difficult to accomplish for packages having a
complicated wrapped definition in `all-packages.nix`.
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index d99c2a40b081c..bc1678335947b 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -28,12 +28,12 @@ let
     , extraPlugins ? []
     , extraNativeMessagingHosts ? []
     , gdkWayland ? false
+    , cfg ? config.${browserName} or {}
     }:
 
     assert gdkWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used
 
     let
-      cfg = config.${browserName} or {};
       enableAdobeFlash = cfg.enableAdobeFlash or false;
       ffmpegSupport = browser.ffmpegSupport or false;
       gssSupport = browser.gssSupport or false;