diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-03-05 14:54:41 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-03-05 14:59:40 +0100 |
| commit | 71f899c2c3b114ecf133ee0f25e6f2ef42df1d07 (patch) | |
| tree | f24f7dea473459f1b91557e3e56ebae43aeff1e5 /pkgs/applications/networking/instant-messengers | |
| parent | 9b7d93edc95d8bde41c51e5e4c07371aa6b3c20e (diff) | |
| parent | 04c31a5de10a64c52440846f47b22a8e7312081c (diff) | |
| download | nixlib-71f899c2c3b114ecf133ee0f25e6f2ef42df1d07.tar nixlib-71f899c2c3b114ecf133ee0f25e6f2ef42df1d07.tar.gz nixlib-71f899c2c3b114ecf133ee0f25e6f2ef42df1d07.tar.bz2 nixlib-71f899c2c3b114ecf133ee0f25e6f2ef42df1d07.tar.lz nixlib-71f899c2c3b114ecf133ee0f25e6f2ef42df1d07.tar.xz nixlib-71f899c2c3b114ecf133ee0f25e6f2ef42df1d07.tar.zst nixlib-71f899c2c3b114ecf133ee0f25e6f2ef42df1d07.zip | |
Merge #34461: mesa -> libGL* rename
This will just bit rot otherwise. Almost nothing gets rebuilt.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 3caa75acb070..e24ea5e6fb37 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat , alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd -, mesa_noglu, xcbutilkeysyms, xdg_utils, libtool }: +, libGL, xcbutilkeysyms, xdg_utils, libtool }: let @@ -37,7 +37,7 @@ let expat xcbutilkeysyms systemd - mesa_noglu + libGL ] + ":${stdenv.cc.cc.lib}/lib64"; src = diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index d7e960d2329e..3c164820019b 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, mesa, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... + libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: assert stdenv.system == "x86_64-linux"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libpulseaudio libxml2 libxslt - mesa + libGLU_combined nspr nss openssl diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index b6a4e7944d3c..e13f0001f02b 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, system, makeWrapper, alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, - libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: + libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: let |