diff options
author | AndersonTorres <torres.anderson.85@protonmail.com> | 2021-06-09 23:57:09 -0300 |
---|---|---|
committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2021-06-10 01:12:49 -0300 |
commit | e9e5f5f84dedea81605e493ea6cec41275a9a8fd (patch) | |
tree | e84786baabde5e495f27b31a2d81fbe7b301f5ad /pkgs/applications/networking | |
parent | 7f7f2ef93a601eca84a0958f3b76d2b3f9db3391 (diff) |
Change all alsaLib references to alsa-lib
Diffstat (limited to 'pkgs/applications/networking')
46 files changed, 95 insertions, 95 deletions
diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index e9e22741c412b..2f52a432f4be6 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , at-spi2-atk , at-spi2-core , atk @@ -55,7 +55,7 @@ with lib; let deps = [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index feff2a74b14e0..7d666f5ba9f0b 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl , dpkg -, alsaLib +, alsa-lib , at-spi2-atk , at-spi2-core , atk @@ -46,7 +46,7 @@ let rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 57cac09191295..156932aa13f1d 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -9,7 +9,7 @@ , python2, python3, perl, pkg-config , nspr, systemd, libkrb5 -, util-linux, alsaLib +, util-linux, alsa-lib , bison, gperf , glib, gtk3, dbus-glib , glibc @@ -144,7 +144,7 @@ let buildInputs = defaultDependencies ++ [ nspr nss systemd - util-linux alsaLib + util-linux alsa-lib bison gperf libkrb5 glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL @@ -206,7 +206,7 @@ let substituteInPlace services/audio/audio_sandbox_hook_linux.cc \ --replace \ '/usr/share/alsa/' \ - '${alsaLib}/share/alsa/' \ + '${alsa-lib}/share/alsa/' \ --replace \ '/usr/lib/x86_64-linux-gnu/gconv/' \ '${glibc}/lib/gconv/' \ diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index fc7029933383f..725205c5c2098 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, config, wrapGAppsHook -, alsaLib +, alsa-lib , atk , cairo , curl @@ -93,7 +93,7 @@ stdenv.mkDerivation { libPath = lib.makeLibraryPath [ stdenv.cc.cc - alsaLib + alsa-lib atk cairo curl diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index a44fb2032f487..2d2073b80b043 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -18,7 +18,7 @@ ## optional libraries -, alsaSupport ? stdenv.isLinux, alsaLib +, alsaSupport ? stdenv.isLinux, alsa-lib , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , ffmpegSupport ? true , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook @@ -180,7 +180,7 @@ buildStdenv.mkDerivation ({ # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ nspr nss_pkg ] - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 ++ lib.optional gssSupport libkrb5 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 13becfc4f6297..53c461641dc1a 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ , replace, fetchurl, zip, unzip, jq, xdg-utils, writeText ## various stuff that can be plugged in -, ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify +, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify , gnome/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native @@ -68,9 +68,9 @@ let ++ lib.optional gssSupport libkrb5 ++ lib.optional useGlvnd libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) - (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) + (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsa-lib zlib ]) ++ lib.optional (config.pulseaudio or true) libpulseaudio - ++ lib.optional alsaSupport alsaLib + ++ lib.optional alsaSupport alsa-lib ++ pkcs11Modules; gtk_modules = [ libcanberra-gtk2 ]; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index a7b9ddd07d0d9..ec03a77d2680d 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -3,7 +3,7 @@ # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb -, alsaLib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups +, alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , libkrb5, libdrm, mesa , libxkbcommon, wayland # ozone/wayland @@ -59,7 +59,7 @@ let deps = [ glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb - alsaLib libXdamage libXtst libXrandr libxshmfence expat cups + alsa-lib libXdamage libXtst libXrandr libxshmfence expat cups dbus gdk-pixbuf gcc-unwrapped.lib systemd libexif diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 2028c5a7b2077..0bad6c58d0a17 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -1,4 +1,4 @@ -{ alsaLib +{ alsa-lib , atk , cairo , cups @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 63f1958f4a6c0..c76902acab671 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -5,7 +5,7 @@ , lib , fetchFromGitHub , writeScript -, alsaLib +, alsa-lib , autoconf213 , cairo , desktop-file-utils @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib cairo dbus dbus-glib diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index dabe0fd373ee8..4f8d813f05578 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsaLib, dbus, cups, libexif, ffmpeg, systemd +, alsa-lib, dbus, cups, libexif, ffmpeg, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat , libuuid , libxml2 @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd + atk at-spi2-atk at-spi2-core alsa-lib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr libxml2 pango cairo gnome2.GConf libdrm mesa diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix index 327fc5f31e2fa..f9be7e9ec9aab 100644 --- a/pkgs/applications/networking/browsers/webbrowser/default.nix +++ b/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -5,7 +5,7 @@ # Runtime , xorg, zip, freetype, fontconfig, glibc, libffi -, dbus, dbus-glib, gtk2, alsaLib, jack2, ffmpeg +, dbus, dbus-glib, gtk2, alsa-lib, jack2, ffmpeg }: let @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2 + alsa-lib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2 gnome2.GConf xorg.libXt ]; diff --git a/pkgs/applications/networking/hpmyroom/default.nix b/pkgs/applications/networking/hpmyroom/default.nix index 63d0d0b2978b2..64a237480c651 100644 --- a/pkgs/applications/networking/hpmyroom/default.nix +++ b/pkgs/applications/networking/hpmyroom/default.nix @@ -1,5 +1,5 @@ { mkDerivation, stdenv, lib, fetchurl, rpmextract, autoPatchelfHook , libuuid -, libXtst, libXfixes, glib, gst_all_1, alsaLib, freetype, fontconfig , libXext +, libXtst, libXfixes, glib, gst_all_1, alsa-lib, freetype, fontconfig , libXext , libGL, libpng, libXScrnSaver, libxcb, xorg, libpulseaudio, libdrm }: mkDerivation rec { @@ -16,7 +16,7 @@ mkDerivation rec { ]; buildInputs = [ - libuuid libXtst libXScrnSaver libXfixes alsaLib freetype fontconfig libXext + libuuid libXtst libXScrnSaver libXfixes alsa-lib freetype fontconfig libXext libGL libpng libxcb libpulseaudio libdrm glib # For libgobject stdenv.cc.cc # For libstdc++ diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 0c6b33e04a224..03f0bf6381803 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, zlib, openssl, libre, librem, pkg-config, gst_all_1 -, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg +, cairo, mpg123, alsa-lib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg , gsm, speex, portaudio, spandsp, libuuid, libvpx }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; buildInputs = [zlib openssl libre librem cairo mpg123 - alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid + alsa-lib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid libvpx ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]); makeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index b3cd9d8c140bb..6e57e0e9423cf 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -32,7 +32,7 @@ , libXft , libXcomposite , libXScrnSaver -, alsaLib +, alsa-lib , pulseaudio , makeWrapper , xdg-utils @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { libXft libXcomposite libXScrnSaver - alsaLib + alsa-lib pulseaudio ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index a155737499e87..a8b2b02f0bfde 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -1,6 +1,6 @@ { pname, version, src, binaryName, desktopName , autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook -, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig +, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { inherit pname version src; nativeBuildInputs = [ - alsaLib + alsa-lib autoPatchelfHook cups libdrm @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ libcxx systemd libpulseaudio libdrm mesa - stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype + stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss libxcb pango systemd libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 6fac3657c7cbd..d63318ecfaf7a 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -17,7 +17,7 @@ , dbus , nss , nspr -, alsaLib +, alsa-lib , cups , expat , udev @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { gnome2.GConf nss nspr - alsaLib + alsa-lib cups expat stdenv.cc.cc diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix index 6fe0e3b13b27c..854cc18a47ff7 100644 --- a/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, alsaLib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl +{ lib, stdenv, alsa-lib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl , fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libdrm, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx @@ -7,7 +7,7 @@ let gitterDirectorySuffix = "opt/gitter"; libPath = lib.makeLibraryPath [ - alsaLib + alsa-lib atk at-spi2-core cairo diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index cbbe74481c236..6a677c9e0d612 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat -, alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd +, alsa-lib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd , libGL, xcbutilkeysyms, xdg-utils, libtool }: let @@ -28,7 +28,7 @@ let nss nspr dbus - alsaLib + alsa-lib zlib libtool libxml2 diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 5fa5c2a286412..e2ace1a5d35f1 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk8 # Optional, Jitsi still runs without, but you may pass null: -, alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg +, alsa-lib, dbus, gtk2, libpulseaudio, openssl, xorg }: let jdk = jdk8; in @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath ([ stdenv.cc.cc # For libstdc++. - alsaLib + alsa-lib dbus gtk2 libpulseaudio diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 058a96ea622eb..5b14fba5b420b 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk-pixbuf, glib, freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, -libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev, wrapGAppsHook, +libXScrnSaver, nss, nspr, alsa-lib, cups, expat, udev, wrapGAppsHook, hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk }: let rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index bad54f455b086..94e0dc9c8c2f3 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -7,7 +7,7 @@ , libtool , pjsip , libyamlcpp -, alsaLib +, alsa-lib , libpulseaudio , libsamplerate , libsndfile @@ -95,7 +95,7 @@ stdenv.mkDerivation { buildInputs = [ pjsip' libyamlcpp - alsaLib + alsa-lib libpulseaudio libsamplerate libsndfile diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 6d6e70ff26a04..dbcd447d156dc 100755 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -1,7 +1,7 @@ { lib, mkDerivation, fetchurl, makeFontsConf, appimageTools , qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats , autoPatchelfHook, desktop-file-utils, imagemagick -, twemoji-color-font, xorg, libsodium, libopus, libGL, alsaLib }: +, twemoji-color-font, xorg, libsodium, libopus, libGL, alsa-lib }: mkDerivation rec { pname = "ripcord"; @@ -19,7 +19,7 @@ mkDerivation rec { }; nativeBuildInputs = [ autoPatchelfHook desktop-file-utils imagemagick ]; - buildInputs = [ libsodium libopus libGL alsaLib ] + buildInputs = [ libsodium libopus libGL alsa-lib ] ++ [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ] ++ (with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]); diff --git a/pkgs/applications/networking/instant-messengers/seren/default.nix b/pkgs/applications/networking/instant-messengers/seren/default.nix index 63cefbd2ffd1c..ed02def3eb88d 100644 --- a/pkgs/applications/networking/instant-messengers/seren/default.nix +++ b/pkgs/applications/networking/instant-messengers/seren/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, alsaLib +, alsa-lib , libopus , libogg , gmp @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "seren"; version = "0.0.21"; - buildInputs = [ alsaLib libopus libogg gmp ncurses ]; + buildInputs = [ alsa-lib libopus libogg gmp ncurses ]; src = fetchurl { url = "http://holdenc.altervista.org/seren/downloads/${pname}-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 67a52113df329..616a085710244 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite -, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib +, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa # Runtime dependencies: , systemd, libnotify, libdbusmenu, libpulseaudio @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 8caafdd57624e..4eb536256240a 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome +, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg , at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: @@ -10,7 +10,7 @@ let version = "8.69.0.77"; rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib atk at-spi2-atk at-spi2-core diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 4db4580f58ac7..1377835521125 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,7 +4,7 @@ , undmg , makeWrapper , nodePackages -, alsaLib +, alsa-lib , at-spi2-atk , at-spi2-core , atk @@ -80,7 +80,7 @@ let passthru.updateScript = ./update.sh; rpath = lib.makeLibraryPath [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix index 47027da9a9199..026dc5b640567 100644 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig +{ lib, stdenv, fetchurl, dpkg, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gnome2, gtk2, nspr, nss, pango, udev, xorg }: let fullPath = lib.makeLibraryPath [ - alsaLib + alsa-lib atk cairo cups diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index d2648eff57ccb..048d40082daa9 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config -, alsaLib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin +, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin }: let @@ -12,7 +12,7 @@ let deps = [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama - xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qtbase qtwebengine qtwebchannel qtsvg + xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg qtwebsockets libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index c88c97705fd9d..02330d1107882 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash -, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk # Transitive dependencies: , pcre, xorg, util-linux, libselinux, libsepol, epoxy @@ -37,7 +37,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash - ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk tg_owt # Transitive dependencies: diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 27af9698788ef..acdf4e660c7c3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, fetchpatch, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash -, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, dee, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk, libtgvoip # Transitive dependencies: , pcre, xorg, util-linux, libselinux, libsepol, epoxy @@ -57,7 +57,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash - dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + dee ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk tg_owt libtgvoip # Transitive dependencies: diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 6bd72134e0272..614183b72d08c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm -, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf +, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf , xorg, libXtst }: @@ -23,7 +23,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkg-config cmake ninja yasm ]; buildInputs = [ - libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf + libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf xorg.libX11 libXtst ]; diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index 8b306c0750621..01c83ba7b1cce 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -12,7 +12,7 @@ , qtbase , qttools , qtquickcontrols2 -, alsaLib +, alsa-lib , speex , ilbc , fetchurl @@ -41,7 +41,7 @@ mkDerivation rec { qtbase qttools qtquickcontrols2 - alsaLib + alsa-lib speex ilbc ]; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 7496063c58eeb..66d33533a736c 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,5 +1,5 @@ {fetchurl, lib, stdenv, dpkg, makeWrapper, - alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, + alsa-lib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { dontUnpack = true; libPath = lib.makeLibraryPath [ - alsaLib + alsa-lib cups curl dbus diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 96ae3993b383b..51b119aa6de50 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, rpmextract, undmg, autoPatchelfHook -, xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify +, xorg, gtk3, gnome2, nss, alsa-lib, udev, libnotify , wrapGAppsHook }: let @@ -35,7 +35,7 @@ let nativeBuildInputs = [ rpmextract autoPatchelfHook wrapGAppsHook ]; buildInputs = (with xorg; [ libXdamage libXtst libXScrnSaver libxkbfile - ]) ++ [ gtk3 nss alsaLib ]; + ]) ++ [ gtk3 nss alsa-lib ]; runtimeDependencies = [ (lib.getLib udev) libnotify ]; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index ba0f867b2aa1d..371ac91120b57 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -1,4 +1,4 @@ -{ alsaLib, autoPatchelfHook, fetchurl, gtk3, libnotify +{ alsa-lib, autoPatchelfHook, fetchurl, gtk3, libnotify , makeDesktopItem, makeWrapper, nss, lib, stdenv, udev, xdg-utils , xorg }: @@ -37,7 +37,7 @@ in stdenv.mkDerivation { buildInputs = with xorg; [ libXdmcp libXScrnSaver libXtst ] ++ [ - alsaLib gtk3 nss + alsa-lib gtk3 nss ]; runtimeDependencies = [ (getLib udev) libnotify ]; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 364e6e294ec03..191176e539e8b 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -3,7 +3,7 @@ , fetchurl , makeWrapper # Dynamic libraries -, alsaLib +, alsa-lib , atk , cairo , dbus @@ -39,7 +39,7 @@ let libs = lib.makeLibraryPath ([ # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' - alsaLib + alsa-lib atk cairo dbus diff --git a/pkgs/applications/networking/insync/v3.nix b/pkgs/applications/networking/insync/v3.nix index 0c18ec60ab659..ad202871b9918 100644 --- a/pkgs/applications/networking/insync/v3.nix +++ b/pkgs/applications/networking/insync/v3.nix @@ -10,7 +10,7 @@ , nss , libthai , wayland -, alsaLib +, alsa-lib , qtvirtualkeyboard , qtwebchannel , qtwebsockets @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - alsaLib + alsa-lib libGL libthai libxcb diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 29667eb52c60c..6c0de05a7404f 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , autoPatchelfHook -, alsaLib +, alsa-lib , coreutils , db , dpkg @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib db glib gtk3 diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index b81128545d59b..f3634b744aa44 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, config, makeWrapper -, alsaLib +, alsa-lib , at-spi2-atk , atk , cairo @@ -78,7 +78,7 @@ stdenv.mkDerivation { libPath = lib.makeLibraryPath [ stdenv.cc.cc - alsaLib + alsa-lib at-spi2-atk atk cairo diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 31a15d69487ea..8e28190fea4c2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -58,7 +58,7 @@ , debugBuild ? false -, alsaSupport ? stdenv.isLinux, alsaLib +, alsaSupport ? stdenv.isLinux, alsa-lib , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , waylandSupport ? true, libdrm @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { xorg.libXdamage zip zlib - ] ++ lib.optional alsaSupport alsaLib + ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional gtk3Support gtk3 ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optionals waylandSupport [ libxkbcommon libdrm ]; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 68a9362b87fdc..33030e0c7eec6 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, dpkg -, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype +, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, mesa , xorg, autoPatchelfHook, systemd, libnotify, libappindicator }: let deps = [ - alsaLib + alsa-lib atk cairo cups diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 088391ba48f72..e0c5b50be0f36 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, qt5 , avahi, boost, libopus, libsndfile, protobuf, speex, libcap -, alsaLib, python3 +, alsa-lib, python3 , rnnoise , jackSupport ? false, libjack2 , speechdSupport ? false, speechd @@ -73,7 +73,7 @@ let nativeBuildInputs = [ qt5.qttools ]; buildInputs = [ libopus libsndfile speex qt5.qtsvg rnnoise ] - ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional jackSupport libjack2 ++ lib.optional speechdSupport speechd ++ lib.optional pulseSupport libpulseaudio; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index bd9371fff134d..b3968ed86045a 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -21,7 +21,7 @@ # Runtime dependencies; # A few additional ones (e.g. Node) are already shipped together with the # AppImage, so we don't have to duplicate them here. - alsaLib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev + alsa-lib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, nss, udev }: let @@ -54,7 +54,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ - alsaLib + alsa-lib dbus-glib fuse gtk3 diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index dc7b0b0a4c8d8..84e52128b6672 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib, AppKit }: +{ lib, stdenv, fetchFromGitHub, openssl, libsamplerate, alsa-lib, AppKit }: stdenv.mkDerivation rec { pname = "pjsip"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl libsamplerate ] - ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional stdenv.isDarwin AppKit; preConfigure = '' diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 8a96cf84755bf..506f129d35960 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more -, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3 +, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib atk cairo dconf diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 8e0f4dde81680..942090f2bdf0d 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsaLib, ffmpeg, glib, openssl +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsa-lib, ffmpeg, glib, openssl , pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama , libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland , gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { buildInputs = with lib; [ - alsaLib + alsa-lib cairo cups ffmpeg |