diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-11-30 21:12:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-30 21:12:27 +0100 |
commit | f99271be7c525e7b05a84432ea5b4da5cf6b7e34 (patch) | |
tree | c578ae1be2ca5a148ccd8b72103b1edbc155d53f /pkgs/applications/networking | |
parent | ab38b440307f0ba839d348c85eae57b712a44d1c (diff) | |
parent | a69ad18da9aa6a77b18986cc1f97b7bf6df44f08 (diff) | |
download | nixpkgs-f99271be7c525e7b05a84432ea5b4da5cf6b7e34.tar nixpkgs-f99271be7c525e7b05a84432ea5b4da5cf6b7e34.tar.gz nixpkgs-f99271be7c525e7b05a84432ea5b4da5cf6b7e34.tar.bz2 nixpkgs-f99271be7c525e7b05a84432ea5b4da5cf6b7e34.tar.lz nixpkgs-f99271be7c525e7b05a84432ea5b4da5cf6b7e34.tar.xz nixpkgs-f99271be7c525e7b05a84432ea5b4da5cf6b7e34.tar.zst nixpkgs-f99271be7c525e7b05a84432ea5b4da5cf6b7e34.zip |
Merge pull request #74023 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/applications/networking')
8 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index aff4d54c620..902357fb90e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -13,7 +13,7 @@ , bison, gperf , glib, gtk3, dbus-glib , glibc -, libXScrnSaver, libXcursor, libXtst, libGLU_combined, libGL +, libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core , jdk @@ -123,7 +123,7 @@ let utillinux alsaLib bison gperf kerberos glib gtk3 dbus-glib - libXScrnSaver libXcursor libXtst libGLU_combined + libXScrnSaver libXcursor libXtst libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core jdk.jre ] ++ optional gnomeKeyringSupport libgnome-keyring3 diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 537a30c01a2..c9dbe6ba4b9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -32,7 +32,7 @@ , libgnomeui , libnotify , gnome3 -, libGLU_combined +, libGLU, libGL , nspr , nss , pango @@ -126,7 +126,7 @@ stdenv.mkDerivation { libgnome libgnomeui libnotify - libGLU_combined + libGLU libGL nspr nss pango diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 1c6ddfc99eb..6c49c00ca6c 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -7,7 +7,7 @@ { lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify -, yasm, libGLU_combined, sqlite, unzip, makeWrapper +, yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libXdamage, libevent, libstartup_notification, libvpx , icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { gtk2 perl zip libIDL libjpeg zlib bzip2 dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - libnotify xorg.pixman yasm libGLU_combined + libnotify xorg.pixman yasm libGLU libGL xorg.libXScrnSaver xorg.xorgproto xorg.libXext sqlite unzip makeWrapper libevent libstartup_notification libvpx /* cairo */ diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 07234f59a8e..05262b0cf50 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -3,7 +3,7 @@ , dbus, dbus-glib, ffmpeg, file, fontconfig, freetype , gnome2, gnum4, gtk2, hunspell, libevent, libjpeg , libnotify, libstartup_notification, makeWrapper -, libGLU_combined, perl, python, libpulseaudio +, libGLU, libGL, perl, python, libpulseaudio , unzip, xorg, wget, which, yasm, zip, zlib }: @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { buildInputs = [ alsaLib bzip2 cairo dbus dbus-glib ffmpeg file fontconfig freetype gnome2.GConf gnum4 gtk2 hunspell libevent libjpeg libnotify - libstartup_notification makeWrapper libGLU_combined perl + libstartup_notification makeWrapper libGLU libGL perl pkgconfig python libpulseaudio unzip wget which yasm zip zlib ] ++ (with xorg; [ libX11 libXext libXft libXi libXrender libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 1b3e1c8ad81..acdec1dc99c 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,6 +1,6 @@ {fetchurl, stdenv, dpkg, makeWrapper, alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, - libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... + libpulseaudio, libxml2, libxslt, libGLU, libGL, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: stdenv.mkDerivation { @@ -32,7 +32,7 @@ stdenv.mkDerivation { libpulseaudio libxml2 libxslt - libGLU_combined + libGLU libGL nspr nss openssl diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index ad98cd660d9..6cdbe4d58ad 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -34,7 +34,7 @@ , libgnome , libgnomeui , gnome3 -, libGLU_combined +, libGLU, libGL , nspr , nss , pango @@ -116,7 +116,7 @@ stdenv.mkDerivation { libcanberra-gtk2 libgnome libgnomeui - libGLU_combined + libGLU libGL nspr nss pango diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index a4edc76caca..78ed553ccd8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python2, python3, nodejs , libIDL, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify -, yasm, libGLU_combined, sqlite, zip, unzip +, yasm, libGLU, libGL, sqlite, zip, unzip , libevent, libstartup_notification , icu, libpng, jemalloc , autoconf213, which, m4, fetchpatch @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { [ gtk2 zip libIDL libjpeg zlib bzip2 dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - nspr nss libnotify xorg.pixman yasm libGLU_combined + nspr nss libnotify xorg.pixman yasm libGLU libGL xorg.libXScrnSaver xorg.xorgproto xorg.libXext sqlite unzip libevent libstartup_notification /* cairo */ diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 0f4272985d0..03a2ef9551b 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem -, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg +, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg , lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome , pulseaudio }: @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { buildInputs = [ atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango - gnome2.gtkglext libGLU_combined freetype fontconfig + gnome2.gtkglext libGLU libGL freetype fontconfig pangox_compat polkit polkit_gnome pulseaudio ] ++ (with xorg; [ libxcb libxkbfile libX11 libXdamage libXext libXfixes libXi libXmu |