diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-18 11:43:54 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-18 11:43:54 +0200 |
| commit | 8d8dc1fa34fe1d3b99b14f87f483f44b589009ae (patch) | |
| tree | b4a36a1aa716d01d4e19529ed38a97decac7dbd2 /pkgs/applications/networking | |
| parent | b889d7a43fd49798a315f9a4c7c05b90b8c600d0 (diff) | |
| parent | 821a3beb1048273bbba5e9636916281fce5dd577 (diff) | |
| download | nixlib-8d8dc1fa34fe1d3b99b14f87f483f44b589009ae.tar nixlib-8d8dc1fa34fe1d3b99b14f87f483f44b589009ae.tar.gz nixlib-8d8dc1fa34fe1d3b99b14f87f483f44b589009ae.tar.bz2 nixlib-8d8dc1fa34fe1d3b99b14f87f483f44b589009ae.tar.lz nixlib-8d8dc1fa34fe1d3b99b14f87f483f44b589009ae.tar.xz nixlib-8d8dc1fa34fe1d3b99b14f87f483f44b589009ae.tar.zst nixlib-8d8dc1fa34fe1d3b99b14f87f483f44b589009ae.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/applications/networking')
3 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index acd3493fe7c8..c18f77f8f996 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -14,7 +14,7 @@ , glib, gtk2, gtk3, dbus-glib , libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups -, ffmpeg, libxslt, libxml2 +, ffmpeg, libxslt, libxml2, at-spi2-core # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport @@ -129,7 +129,8 @@ let ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio; + ++ optional pulseSupport libpulseaudio + ++ optional (versionAtLeast version "71") at-spi2-core; patches = [ # As major versions are added, you can trawl the gentoo and arch repos at @@ -232,7 +233,6 @@ let is_clang = false; clang_use_chrome_plugins = false; remove_webcore_debug_symbols = true; - use_gtk3 = true; enable_swiftshader = false; fieldtrial_testing_like_official_build = true; @@ -243,6 +243,8 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; google_default_client_id = "404761575300.apps.googleusercontent.com"; google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; + } // optionalAttrs (versionRange "60" "70") { + use_gtk3 = true; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 2a80349c4e62..e08fdad50fb4 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit src; nodejs = nodejs-8_x; - sha256 = "0mg1ilz65qyxgh5zg1f8fhx7ygz10w8ifamflpwbk8mrvqpkjlvr"; + sha256 = "0hbw47653wh159c34f0rlj3p7xy0lvsyp0wh2hl35kv3fnsfbbm0"; }; patches = [ ./isDev.patch ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 03a99aea4001..1e8080fd9c9d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -13,6 +13,8 @@ let in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { + version = "1.4.4"; + sha256Hash = "1m1j485r3vzpglzfn8l4cqskysvkx8l3pqaw3fgp66jfajbxynf0"; stable = false; }); } |