diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-07-06 13:40:38 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-07-06 13:44:40 +0200 |
| commit | 0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4 (patch) | |
| tree | 146620da711f1221bbc226b5ffa36407b50a3fc3 /pkgs/applications/networking/browsers | |
| parent | 8e97d0be6bf0b381935e3b8429430d645dc2e226 (diff) | |
| parent | d567c486ca5ac5f0c83bb0264c325204a479a5bb (diff) | |
Merge branch 'master' into staging-next
There are several thousand rebuilds from master already. Hydra nixpkgs: ?compare=1528940
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/brave/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 85785d285db72..4a6af3f96b445 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -16,6 +16,7 @@ , gnome3 , gsettings-desktop-schemas , gtk3 +, libpulseaudio , libuuid , libX11 , libXcomposite @@ -55,6 +56,7 @@ rpath = lib.makeLibraryPath [ glib gnome2.GConf gtk3 + libpulseaudio libX11 libXScrnSaver libXcomposite diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 50eae97ae7c07..c52bf0ba95e16 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -205,6 +205,6 @@ stdenv.mkDerivation { url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; }; platforms = builtins.attrNames mozillaPlatforms; - maintainers = with maintainers; [ garbas ]; + maintainers = with maintainers; [ ]; }; } |