diff --git a/nixos/doc/manual/configuration/gpu-accel.xml b/nixos/doc/manual/configuration/gpu-accel.xml
index 3695a5ff445a..9aa9be86a061 100644
--- a/nixos/doc/manual/configuration/gpu-accel.xml
+++ b/nixos/doc/manual/configuration/gpu-accel.xml
@@ -178,9 +178,9 @@ GPU1:
Core Next (GCN) GPUs are supported through either radv, which is
part of mesa, or the amdvlk package.
Adding the amdvlk package to
- makes both drivers
- available for applications and lets them choose. A specific driver can
- be forced as follows:
+ makes amdvlk the
+ default driver and hides radv and lavapipe from the device list. A
+ specific driver can be forced as follows:
= [
pkgs.amdvlk
@@ -191,10 +191,9 @@ GPU1:
pkgs.driversi686Linux.amdvlk
];
- # For amdvlk
- .VK_ICD_FILENAMES =
- "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json";
- # For radv
+ # Force radv
+ .AMD_VULKAN_ICD = "RADV";
+ # Or
.VK_ICD_FILENAMES =
"/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 7ea2940292b3..2cbbbc522e1d 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -252,7 +252,7 @@ in
postsrsd = 220;
opendkim = 221;
dspam = 222;
- gale = 223;
+ # gale = 223; removed 2021-06-10
matrix-synapse = 224;
rspamd = 225;
# rmilter = 226; # unused, removed 2019-08-22
@@ -562,7 +562,7 @@ in
postsrsd = 220;
opendkim = 221;
dspam = 222;
- gale = 223;
+ # gale = 223; removed 2021-06-10
matrix-synapse = 224;
rspamd = 225;
# rmilter = 226; # unused, removed 2019-08-22
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0c9a7055aa73..06f9a05cf666 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -692,7 +692,6 @@
./services/networking/flannel.nix
./services/networking/freenet.nix
./services/networking/freeradius.nix
- ./services/networking/gale.nix
./services/networking/gateone.nix
./services/networking/gdomap.nix
./services/networking/ghostunnel.nix
diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix
deleted file mode 100644
index cb954fd836bc..000000000000
--- a/nixos/modules/services/networking/gale.nix
+++ /dev/null
@@ -1,181 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.services.gale;
- # we convert the path to a string to avoid it being copied to the nix store,
- # otherwise users could read the private key as all files in the store are
- # world-readable
- keyPath = toString cfg.keyPath;
- # ...but we refer to the pubkey file using a path so that we can ensure the
- # config gets rebuilt if the public key changes (we can assume the private key
- # will never change without the public key having changed)
- gpubFile = cfg.keyPath + "/${cfg.domain}.gpub";
- home = "/var/lib/gale";
- keysPrepared = cfg.keyPath != null && lib.pathExists cfg.keyPath;
-in
-{
- options = {
- services.gale = {
- enable = mkEnableOption "the Gale messaging daemon";
-
- user = mkOption {
- default = "gale";
- type = types.str;
- description = "Username for the Gale daemon.";
- };
-
- group = mkOption {
- default = "gale";
- type = types.str;
- description = "Group name for the Gale daemon.";
- };
-
- setuidWrapper = mkOption {
- default = null;
- description = "Configuration for the Gale gksign setuid wrapper.";
- };
-
- domain = mkOption {
- default = "";
- type = types.str;
- description = "Domain name for the Gale system.";
- };
-
- keyPath = mkOption {
- default = null;
- type = types.nullOr types.path;
- description = ''
- Directory containing the key pair for this Gale domain. The expected
- filename will be taken from the domain option with ".gpri" and ".gpub"
- appended.
- '';
- };
-
- extraConfig = mkOption {
- type = types.lines;
- default = "";
- description = ''
- Additional text to be added to /etc/gale/conf.
- '';
- };
- };
- };
-
- config = mkMerge [
- (mkIf cfg.enable {
- assertions = [{
- assertion = cfg.domain != "";
- message = "A domain must be set for Gale.";
- }];
-
- warnings = mkIf (!keysPrepared) [
- "You must run gale-install in order to generate a domain key."
- ];
-
- system.activationScripts.gale = mkIf cfg.enable (
- stringAfter [ "users" "groups" ] ''
- chmod 755 ${home}
- mkdir -m 0777 -p ${home}/auth/cache
- mkdir -m 1777 -p ${home}/auth/local # GALE_DOMAIN.gpub
- mkdir -m 0700 -p ${home}/auth/private # ROOT.gpub
- mkdir -m 0755 -p ${home}/auth/trusted # ROOT
- mkdir -m 0700 -p ${home}/.gale
- mkdir -m 0700 -p ${home}/.gale/auth
- mkdir -m 0700 -p ${home}/.gale/auth/private # GALE_DOMAIN.gpri
-
- ln -sf ${pkgs.gale}/etc/gale/auth/trusted/ROOT "${home}/auth/trusted/ROOT"
- chown ${cfg.user}:${cfg.group} ${home} ${home}/auth ${home}/auth/*
- chown ${cfg.user}:${cfg.group} ${home}/.gale ${home}/.gale/auth ${home}/.gale/auth/private
- ''
- );
-
- environment = {
- etc = {
- "gale/auth".source = home + "/auth"; # symlink /var/lib/gale/auth
- "gale/conf".text = ''
- GALE_USER ${cfg.user}
- GALE_DOMAIN ${cfg.domain}
- ${cfg.extraConfig}
- '';
- };
-
- systemPackages = [ pkgs.gale ];
- };
-
- users.users.${cfg.user} = {
- description = "Gale daemon";
- uid = config.ids.uids.gale;
- group = cfg.group;
- home = home;
- createHome = true;
- };
-
- users.groups = [{
- name = cfg.group;
- gid = config.ids.gids.gale;
- }];
- })
- (mkIf (cfg.enable && keysPrepared) {
- assertions = [
- {
- assertion = cfg.keyPath != null
- && lib.pathExists (cfg.keyPath + "/${cfg.domain}.gpub");
- message = "Couldn't find a Gale public key for ${cfg.domain}.";
- }
- {
- assertion = cfg.keyPath != null
- && lib.pathExists (cfg.keyPath + "/${cfg.domain}.gpri");
- message = "Couldn't find a Gale private key for ${cfg.domain}.";
- }
- ];
-
- services.gale.setuidWrapper = {
- program = "gksign";
- source = "${pkgs.gale}/bin/gksign";
- owner = cfg.user;
- group = cfg.group;
- setuid = true;
- setgid = false;
- };
-
- security.wrappers.gksign = cfg.setuidWrapper;
-
- systemd.services.gale-galed = {
- description = "Gale messaging daemon";
- wantedBy = [ "multi-user.target" ];
- wants = [ "gale-gdomain.service" ];
- after = [ "network.target" ];
-
- preStart = ''
- install -m 0640 -o ${cfg.user} -g ${cfg.group} ${keyPath}/${cfg.domain}.gpri "${home}/.gale/auth/private/"
- install -m 0644 -o ${cfg.user} -g ${cfg.group} ${gpubFile} "${home}/.gale/auth/private/${cfg.domain}.gpub"
- install -m 0644 -o ${cfg.user} -g ${cfg.group} ${gpubFile} "${home}/auth/local/${cfg.domain}.gpub"
- '';
-
- serviceConfig = {
- Type = "forking";
- ExecStart = "@${pkgs.gale}/bin/galed galed";
- User = cfg.user;
- Group = cfg.group;
- PermissionsStartOnly = true;
- };
- };
-
- systemd.services.gale-gdomain = {
- description = "Gale AKD daemon";
- wantedBy = [ "multi-user.target" ];
- requires = [ "gale-galed.service" ];
- after = [ "gale-galed.service" ];
-
- serviceConfig = {
- Type = "forking";
- ExecStart = "@${pkgs.gale}/bin/gdomain gdomain";
- User = cfg.user;
- Group = cfg.group;
- };
- };
- })
- ];
-}
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index b2f2540fb7a1..badcb99a57af 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -63,7 +63,7 @@ in {
):
serviceClient.sleep(20)
socketActivatedClient.wait_until_succeeds(
- "systemctl status ensure-printers | grep -q -E 'code=exited, status=0/SUCCESS'"
+ "systemctl show ensure-printers | grep -q -E 'code=exited ; status=0'"
)
diff --git a/pkgs/applications/audio/CHOWTapeModel/default.nix b/pkgs/applications/audio/CHOWTapeModel/default.nix
index 025563f98bee..9b9649cf9f8a 100644
--- a/pkgs/applications/audio/CHOWTapeModel/default.nix
+++ b/pkgs/applications/audio/CHOWTapeModel/default.nix
@@ -1,4 +1,4 @@
-{ alsaLib
+{ alsa-lib
, curl
, fetchFromGitHub
, freeglut
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
curl
freeglut
freetype
diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix
index 25cb96965092..3034de750cf9 100644
--- a/pkgs/applications/audio/MMA/default.nix
+++ b/pkgs/applications/audio/MMA/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }:
+{ lib, stdenv, fetchurl, makeWrapper, python3, alsa-utils, timidity }:
stdenv.mkDerivation rec {
version = "20.12";
@@ -10,13 +10,13 @@
};
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ python3 alsaUtils timidity ];
+ buildInputs = [ python3 alsa-utils timidity ];
patchPhase = ''
- sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec
- sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' util/mma-splitrec.py
- sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' mma-splitrec
- sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' util/mma-splitrec.py
+ sed -i 's@/usr/bin/aplaymidi@/${alsa-utils}/bin/aplaymidi@g' mma-splitrec
+ sed -i 's@/usr/bin/aplaymidi@/${alsa-utils}/bin/aplaymidi@g' util/mma-splitrec.py
+ sed -i 's@/usr/bin/arecord@/${alsa-utils}/bin/arecord@g' mma-splitrec
+ sed -i 's@/usr/bin/arecord@/${alsa-utils}/bin/arecord@g' util/mma-splitrec.py
sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec
sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py
find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g'
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index 4f76178a29d0..eafbfec96648 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkg-config, alsaLib, dbus, libjack2
+{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pkg-config, alsa-lib, dbus, libjack2
, python3Packages , meson, ninja }:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config makeWrapper meson ninja ];
- buildInputs = [ alsaLib dbus libjack2 ] ++
+ buildInputs = [ alsa-lib dbus libjack2 ] ++
(with python3Packages; [ python dbus-python ]);
postInstall = ''
diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix
index 8d396d7f2a34..9b0fe1d80ff3 100644
--- a/pkgs/applications/audio/adlplug/default.nix
+++ b/pkgs/applications/audio/adlplug/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjack2, alsaLib
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjack2, alsa-lib
, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor
, fetchpatch, fmt
, adlplugChip ? "-DADLplug_CHIP=OPL3"
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ adlplugChip "-DADLplug_USE_SYSTEM_FMT=ON" ];
buildInputs = [
- libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext
+ libjack2 alsa-lib freetype libX11 libXrandr libXinerama libXext
libXcursor
];
nativeBuildInputs = [ cmake pkg-config fmt ];
diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix
index 000108b6de1f..d8ef7d2b4fa5 100644
--- a/pkgs/applications/audio/aeolus/default.nix
+++ b/pkgs/applications/audio/aeolus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsaLib, libjack2
+{ lib, stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsa-lib, libjack2
, libclxclient, libX11, libXft, readline
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- libclthreads zita-alsa-pcmi alsaLib libjack2 libclxclient
+ libclthreads zita-alsa-pcmi alsa-lib libjack2 libclxclient
libX11 libXft readline
];
diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix
index 418426530bfe..00fde01859c8 100644
--- a/pkgs/applications/audio/aj-snapshot/default.nix
+++ b/pkgs/applications/audio/aj-snapshot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, jack2, minixml, pkg-config }:
+{ lib, stdenv, fetchurl, alsa-lib, jack2, minixml, pkg-config }:
stdenv.mkDerivation rec {
name = packageName + "-" + version ;
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
doCheck = false;
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsaLib minixml jack2 ];
+ buildInputs = [ alsa-lib minixml jack2 ];
meta = with lib; {
description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files";
diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix
index 188584b8e732..388d8b44dcf5 100644
--- a/pkgs/applications/audio/ams/default.nix
+++ b/pkgs/applications/audio/ams/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv
, fetchgit
, automake
-, alsaLib
+, alsa-lib
, ladspaH
, libjack2
, fftw
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
ladspaH
libjack2
fftw
diff --git a/pkgs/applications/audio/ardour/5.nix b/pkgs/applications/audio/ardour/5.nix
index 9e8c075bfb07..b25f9339da13 100644
--- a/pkgs/applications/audio/ardour/5.nix
+++ b/pkgs/applications/audio/ardour/5.nix
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchgit
-, alsaLib
+, alsa-lib
, aubio
, boost
, cairomm
@@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
aubio
boost
cairomm
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 8bb7430650dd..8ebf4bf0fc4b 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchgit
-, alsaLib
+, alsa-lib
, aubio
, boost
, cairomm
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
aubio
boost
cairomm
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 82a2303e26b3..db6e03f47417 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -2,7 +2,7 @@
mkDerivation, lib, fetchurl, fetchpatch,
gettext, pkg-config,
qtbase,
- alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b,
+ alsa-lib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b,
libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug,
libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
@@ -29,7 +29,7 @@ mkDerivation rec {
qtbase
# Plugin dependencies
- alsaLib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb
+ alsa-lib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb
libcdio libcdio-paranoia libcue libjack2 libmad libmms libmodplug libmowgli
libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 0fee289021e4..354bc0ebd764 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -18,7 +18,7 @@
, sqlite
, sratom
, suil
-, alsaLib
+, alsa-lib
, libsndfile
, soxr
, flac
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
expat
ffmpeg
file
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
index b1625868933b..a66a5e6c9dc4 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk-pixbuf
+{ stdenv, fetchurl, alsa-lib, bzip2, cairo, dpkg, freetype, gdk-pixbuf
, wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg
, libbsd, libjack2, libpng, ffmpeg
, libxkbcommon
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
dontWrapGApps = true; # we only want $gappsWrapperArgs here
buildInputs = with xorg; [
- alsaLib bzip2.out cairo freetype gdk-pixbuf gtk2 gtk3 harfbuzz libX11 libXau
+ alsa-lib bzip2.out cairo freetype gdk-pixbuf gtk2 gtk3 harfbuzz libX11 libXau
libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb
libxkbfile pixman xcbutil xcbutilwm zlib
];
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
index 93fa00b827ba..b041d7e19102 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, cairo, dpkg, freetype
+{ stdenv, fetchurl, alsa-lib, cairo, dpkg, freetype
, gdk-pixbuf, glib, gtk3, lib, xorg
, libglvnd, libjack2, ffmpeg
, libxkbcommon, xdg-utils, zlib, pulseaudio
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
dontWrapGApps = true; # we only want $gappsWrapperArgs here
buildInputs = with xorg; [
- alsaLib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib
+ alsa-lib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib
];
binPath = lib.makeBinPath [
diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix
index e86341a608e3..0c9248b5f0bc 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, libjack2, pkg-config, libpulseaudio, xorg }:
+{ lib, stdenv, fetchurl, alsa-lib, libjack2, pkg-config, libpulseaudio, xorg }:
stdenv.mkDerivation rec {
pname = "bristol";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
- alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext
+ alsa-lib libjack2 libpulseaudio xorg.libX11 xorg.libXext
xorg.xorgproto
];
diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix
index 6529cd860c8a..0cc1ccd2aca5 100644
--- a/pkgs/applications/audio/callaudiod/default.nix
+++ b/pkgs/applications/audio/callaudiod/default.nix
@@ -5,7 +5,7 @@
, ninja
, pkg-config
, glib
-, alsaLib
+, alsa-lib
, libpulseaudio
}:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
libpulseaudio
glib
];
diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix
index 04c15eca5993..38514e40d000 100644
--- a/pkgs/applications/audio/carla/default.nix
+++ b/pkgs/applications/audio/carla/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, jack2,
+{ lib, stdenv, fetchFromGitHub, alsa-lib, file, fluidsynth, jack2,
liblo, libpulseaudio, libsndfile, pkg-config, python3Packages,
which, withFrontend ? true,
withQt ? true, qtbase ? null, wrapQtAppsHook ? null,
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
] ++ optional withFrontend pyqt5;
buildInputs = [
- file liblo alsaLib fluidsynth jack2 libpulseaudio libsndfile
+ file liblo alsa-lib fluidsynth jack2 libpulseaudio libsndfile
] ++ optional withQt qtbase
++ optional withGtk2 gtk2
++ optional withGtk3 gtk3;
diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix
index b32eb1b627dd..cc431ff46b9c 100644
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, alsaLib, fftw,
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, alsa-lib, fftw,
libpulseaudio, ncurses }:
stdenv.mkDerivation rec {
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "0.7.4";
buildInputs = [
- alsaLib
+ alsa-lib
fftw
libpulseaudio
ncurses
diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix
index f30b5dba5b6b..e051d8585b5c 100644
--- a/pkgs/applications/audio/chuck/default.nix
+++ b/pkgs/applications/audio/chuck/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, alsaLib, bison, flex, libsndfile, which
+{ stdenv, lib, fetchurl, alsa-lib, bison, flex, libsndfile, which
, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ flex bison which ];
buildInputs = [ libsndfile ]
- ++ lib.optional (!stdenv.isDarwin) alsaLib
+ ++ lib.optional (!stdenv.isDarwin) alsa-lib
++ lib.optional stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ];
patches = [ ./darwin-limits.patch ];
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 4184f0eea8cb..550100574db4 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -42,7 +42,7 @@
, libsepol
, orc
-, alsaLib
+, alsa-lib
}:
let
@@ -107,7 +107,7 @@ let
sqlite
taglib
- alsaLib
+ alsa-lib
]
++ lib.optionals (withIpod) [ libgpod libplist usbmuxd ]
++ lib.optionals (withMTP) [ libmtp ]
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index bfa8317c9f90..ea7ad1015be9 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -1,12 +1,12 @@
{ config, lib, stdenv, fetchFromGitHub, runCommand, ncurses, pkg-config
, libiconv, CoreAudio, AudioUnit
-, alsaSupport ? stdenv.isLinux, alsaLib ? null
+, alsaSupport ? stdenv.isLinux, alsa-lib ? null
# simple fallback for everyone else
, aoSupport ? !stdenv.isLinux, libao ? null
, jackSupport ? false, libjack ? null
, samplerateSupport ? jackSupport, libsamplerate ? null
-, ossSupport ? false, alsaOss ? null
+, ossSupport ? false, alsa-oss ? null
, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio ? null
, mprisSupport ? stdenv.isLinux, systemd ? null
@@ -55,11 +55,11 @@ let
opts = [
# Audio output
- (mkFlag alsaSupport "CONFIG_ALSA=y" alsaLib)
+ (mkFlag alsaSupport "CONFIG_ALSA=y" alsa-lib)
(mkFlag aoSupport "CONFIG_AO=y" libao)
(mkFlag jackSupport "CONFIG_JACK=y" libjack)
(mkFlag samplerateSupport "CONFIG_SAMPLERATE=y" libsamplerate)
- (mkFlag ossSupport "CONFIG_OSS=y" alsaOss)
+ (mkFlag ossSupport "CONFIG_OSS=y" alsa-oss)
(mkFlag pulseaudioSupport "CONFIG_PULSE=y" libpulseaudio)
(mkFlag mprisSupport "CONFIG_MPRIS=y" systemd)
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index a63f75184940..13de229452e5 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, libsndfile, libsamplerate, flex, bison, boost, gettext
-, alsaLib ? null
+, alsa-lib ? null
, libpulseaudio ? null
, libjack2 ? null
, liblo ? null
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake flex bison gettext ];
buildInputs = [ libsndfile libsamplerate boost ]
++ builtins.filter (optional: optional != null) [
- alsaLib libpulseaudio libjack2
+ alsa-lib libpulseaudio libjack2
liblo ladspa-sdk fluidsynth eigen
curl tcltk fltk ];
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 10b4256a8581..c1cecc13ec56 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -25,7 +25,7 @@
, hotkeysSupport ? true, libX11 ? null
, osdSupport ? true, dbus ? null
# output plugins
-, alsaSupport ? true, alsaLib ? null
+, alsaSupport ? true, alsa-lib ? null
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
# effect plugins
, resamplerSupport ? true, libsamplerate ? null
@@ -50,7 +50,7 @@ assert apeSupport -> yasm != null;
assert artworkSupport -> imlib2 != null;
assert hotkeysSupport -> libX11 != null;
assert osdSupport -> dbus != null;
-assert alsaSupport -> alsaLib != null;
+assert alsaSupport -> alsa-lib != null;
assert pulseSupport -> libpulseaudio != null;
assert resamplerSupport -> libsamplerate != null;
assert overloadSupport -> zlib != null;
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
++ optional artworkSupport imlib2
++ optional hotkeysSupport libX11
++ optional osdSupport dbus
- ++ optional alsaSupport alsaLib
+ ++ optional alsaSupport alsa-lib
++ optional pulseSupport libpulseaudio
++ optional resamplerSupport libsamplerate
++ optional overloadSupport zlib
diff --git a/pkgs/applications/audio/diopser/default.nix b/pkgs/applications/audio/diopser/default.nix
index 0c97d64945ba..339eae1a7ca9 100644
--- a/pkgs/applications/audio/diopser/default.nix
+++ b/pkgs/applications/audio/diopser/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
-, libjack2, alsaLib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor
+, libjack2, alsa-lib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor
}:
let
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
- libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext
+ libjack2 alsa-lib freetype libX11 libXrandr libXinerama libXext
libXcursor
];
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 35825833330d..258eec83724e 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -1,6 +1,6 @@
{ lib
, stdenv
-, alsaLib
+, alsa-lib
, fetchFromGitHub
, fftwFloat
, freetype
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config meson ninja ];
buildInputs = rpathLibs ++ [
- alsaLib
+ alsa-lib
freetype
libGL
libX11
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index ef4970a16080..7dd78e513181 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, expat, glib, libjack2, libXext, libX11, libpng
+{ lib, stdenv, fetchurl, alsa-lib, expat, glib, libjack2, libXext, libX11, libpng
, libpthreadstubs, libsmf, libsndfile, lv2, pkg-config, zita-resampler
}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
- alsaLib expat glib libjack2 libXext libX11 libpng libpthreadstubs
+ alsa-lib expat glib libjack2 libXext libX11 libpng libpthreadstubs
libsmf libsndfile lv2 zita-resampler
];
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index c175804a026b..e15e4550e0e5 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }:
+{ mkDerivation, lib, fetchurl, pkg-config, libjack2, alsa-lib, libsndfile, liblo, lv2, qt5 }:
mkDerivation rec {
pname = "drumkv1";
@@ -9,7 +9,7 @@ mkDerivation rec {
sha256 = "1bzkaz7sqx1pvirja8zm7i2ckzl5ad6xspr4840389ik3l8qpnr5";
};
- buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
+ buildInputs = [ libjack2 alsa-lib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix
index e2ec9bf8ab2c..47db22016485 100644
--- a/pkgs/applications/audio/ecasound/default.nix
+++ b/pkgs/applications/audio/ecasound/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv
, fetchurl
, pkg-config
-, alsaLib
+, alsa-lib
, audiofile
, libjack2
, liblo
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
audiofile
libjack2
liblo
diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix
index 6a974abb8aa8..0c48c582c4fc 100644
--- a/pkgs/applications/audio/eflite/default.nix
+++ b/pkgs/applications/audio/eflite/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, flite, alsaLib, debug ? false }:
+{ lib, stdenv, fetchurl, fetchpatch, flite, alsa-lib, debug ? false }:
stdenv.mkDerivation rec {
pname = "eflite";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci";
};
- buildInputs = [ flite alsaLib ];
+ buildInputs = [ flite alsa-lib ];
configureFlags = [
"flite_dir=${flite}"
diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/applications/audio/ensemble-chorus/default.nix
index 7858da25b7c5..b3255126205a 100644
--- a/pkgs/applications/audio/ensemble-chorus/default.nix
+++ b/pkgs/applications/audio/ensemble-chorus/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, fltk, alsa-lib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkg-config }:
stdenv.mkDerivation rec {
pname = "ensemble-chorus";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
- fltk alsaLib freetype libXrandr libXinerama libXcursor lv2 libjack2
+ fltk alsa-lib freetype libXrandr libXinerama libXcursor lv2 libjack2
];
meta = with lib; {
diff --git a/pkgs/applications/audio/faust/faust2alqt.nix b/pkgs/applications/audio/faust/faust2alqt.nix
index 8ac26e488b37..111d1c9e5574 100644
--- a/pkgs/applications/audio/faust/faust2alqt.nix
+++ b/pkgs/applications/audio/faust/faust2alqt.nix
@@ -1,5 +1,5 @@
{ faust
-, alsaLib
+, alsa-lib
, qt4
}:
@@ -8,7 +8,7 @@ faust.wrapWithBuildEnv {
baseName = "faust2alqt";
propagatedBuildInputs = [
- alsaLib
+ alsa-lib
qt4
];
diff --git a/pkgs/applications/audio/faust/faust2alsa.nix b/pkgs/applications/audio/faust/faust2alsa.nix
index 6af5af9bbafb..bb6121a5d70b 100644
--- a/pkgs/applications/audio/faust/faust2alsa.nix
+++ b/pkgs/applications/audio/faust/faust2alsa.nix
@@ -1,5 +1,5 @@
{ faust
-, alsaLib
+, alsa-lib
, atk
, cairo
, fontconfig
@@ -15,7 +15,7 @@ faust.wrapWithBuildEnv {
baseName = "faust2alsa";
propagatedBuildInputs = [
- alsaLib
+ alsa-lib
atk
cairo
fontconfig
diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix
index ab2450f1e529..bd213bfcadbe 100644
--- a/pkgs/applications/audio/faust/faust2jack.nix
+++ b/pkgs/applications/audio/faust/faust2jack.nix
@@ -1,7 +1,7 @@
{ faust
, gtk2
, jack2
-, alsaLib
+, alsa-lib
, opencv
, libsndfile
, which
@@ -19,7 +19,7 @@ faust.wrapWithBuildEnv {
propagatedBuildInputs = [
gtk2
jack2
- alsaLib
+ alsa-lib
opencv
libsndfile
which
diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix
index f6bc4d485fdd..6bebd97ddd24 100644
--- a/pkgs/applications/audio/faust/faust2jaqt.nix
+++ b/pkgs/applications/audio/faust/faust2jaqt.nix
@@ -2,7 +2,7 @@
, jack2
, qt4
, libsndfile
-, alsaLib
+, alsa-lib
, which
}:
@@ -19,7 +19,7 @@ faust.wrapWithBuildEnv {
jack2
qt4
libsndfile
- alsaLib
+ alsa-lib
which
];
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix
index 2b4602f78cfd..46d63c84314b 100644
--- a/pkgs/applications/audio/faust/faustlive.nix
+++ b/pkgs/applications/audio/faust/faustlive.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
-, llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl
+, llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsa-lib, faust, curl
, bc, coreutils, which, libsndfile, pkg-config, libxcb
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook ];
buildInputs = [
- llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsaLib faust curl
+ llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsa-lib faust curl
bc coreutils which libsndfile libxcb
];
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index a1fee315d44b..1a6471397de6 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, cmake
-, alsaLib, glib, libjack2, libsndfile, libpulseaudio
+, alsa-lib, glib, libjack2, libsndfile, libpulseaudio
, AudioUnit, CoreAudio, CoreMIDI, CoreServices
, version ? "2"
}:
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ glib libsndfile libpulseaudio libjack2 ]
- ++ lib.optionals stdenv.isLinux [ alsaLib ]
+ ++ lib.optionals stdenv.isLinux [ alsa-lib ]
++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ];
cmakeFlags = [ "-Denable-framework=off" ];
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index b91c72a5c754..967c984bc50d 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -1,9 +1,9 @@
{ lib, mkDerivation, fetchFromGitHub, fftw, qtbase, qtmultimedia, qmake, itstool, wrapQtAppsHook
-, alsaSupport ? true, alsaLib ? null
+, alsaSupport ? true, alsa-lib ? null
, jackSupport ? false, libjack2 ? null
, portaudioSupport ? false, portaudio ? null }:
-assert alsaSupport -> alsaLib != null;
+assert alsaSupport -> alsa-lib != null;
assert jackSupport -> libjack2 != null;
assert portaudioSupport -> portaudio != null;
@@ -22,7 +22,7 @@ mkDerivation rec {
nativeBuildInputs = [ qmake itstool wrapQtAppsHook ];
buildInputs = [ fftw qtbase qtmultimedia ]
- ++ optionals alsaSupport [ alsaLib ]
+ ++ optionals alsaSupport [ alsa-lib ]
++ optionals jackSupport [ libjack2 ]
++ optionals portaudioSupport [ portaudio ];
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index 7bd063d9f53e..75e44d8c4fad 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype
-, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
+, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsa-lib, libjack2, libvorbis
, libSM, libsndfile, libogg, libtool
}:
let
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook libtool ];
buildInputs = [
freetype SDL SDL_gfx SDL_ttf
- liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM
+ liblo libxml2 libjack2 alsa-lib libvorbis libsndfile libogg libSM
(gnutls.overrideAttrs (oldAttrs: {
configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ];
}))
diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
index 781889f9fe3c..5155a91e725e 100644
--- a/pkgs/applications/audio/ft2-clone/default.nix
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -2,7 +2,7 @@
, fetchFromGitHub
, cmake
, nixosTests
-, alsaLib
+, alsa-lib
, SDL2
, libiconv
, CoreAudio
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ SDL2 ]
- ++ lib.optional stdenv.isLinux alsaLib
+ ++ lib.optional stdenv.isLinux alsa-lib
++ lib.optionals stdenv.isDarwin [
libiconv
CoreAudio
diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix
index c9b3216edef9..b49335298e01 100644
--- a/pkgs/applications/audio/giada/default.nix
+++ b/pkgs/applications/audio/giada/default.nix
@@ -7,7 +7,7 @@
, libsamplerate
, libsndfile
, jack2
-, alsaLib
+, alsa-lib
, libpulseaudio
, libXpm
, libXinerama
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
rtmidi
libXpm
jack2
- alsaLib
+ alsa-lib
libpulseaudio
libXinerama
libXcursor
diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index 9d891d302349..74286073b904 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
+{ lib, stdenv, alsa-lib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
, nss, pango, udev, xorg
}:
@@ -7,7 +7,7 @@ let
version = "4.7.1";
deps = [
- alsaLib
+ alsa-lib
atk
at-spi2-atk
cairo
diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix
index 2d660bc736c1..30c6e57188ab 100644
--- a/pkgs/applications/audio/grandorgue/default.nix
+++ b/pkgs/applications/audio/grandorgue/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchsvn, cmake, gcc, pkg-config, fftwFloat, alsaLib
+{ lib, stdenv, fetchsvn, cmake, gcc, pkg-config, fftwFloat, alsa-lib
, zlib, wavpack, wxGTK31, udev, jackaudioSupport ? false, libjack2
, includeDemo ? true }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ pkg-config fftwFloat alsaLib zlib wavpack wxGTK31 udev ]
+ buildInputs = [ pkg-config fftwFloat alsa-lib zlib wavpack wxGTK31 udev ]
++ lib.optional jackaudioSupport libjack2;
cmakeFlags = lib.optional (!jackaudioSupport) [
diff --git a/pkgs/applications/audio/gwc/default.nix b/pkgs/applications/audio/gwc/default.nix
index 175d5e4cb51e..aeb64b92c88a 100644
--- a/pkgs/applications/audio/gwc/default.nix
+++ b/pkgs/applications/audio/gwc/default.nix
@@ -2,7 +2,7 @@
, fetchFromGitHub
, autoreconfHook
, pkg-config
-, alsaLib
+, alsa-lib
, libpulseaudio
, gtk2
, hicolor-icon-theme
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
libpulseaudio
gtk2
hicolor-icon-theme
diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix
index 6378a97f31d7..012838eb436d 100644
--- a/pkgs/applications/audio/helio-workstation/default.nix
+++ b/pkgs/applications/audio/helio-workstation/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
-, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome
+, alsa-lib, freetype, xorg, curl, libGL, libjack2, gnome
, pkg-config, makeWrapper
}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- alsaLib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr
+ alsa-lib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr
xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome.zenity
];
diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix
index 172f134907c5..86497e090f43 100644
--- a/pkgs/applications/audio/helm/default.nix
+++ b/pkgs/applications/audio/helm/default.nix
@@ -3,7 +3,7 @@
, fetchpatch
, xorg
, freetype
-, alsaLib
+, alsa-lib
, curl
, libjack2
, lv2
@@ -26,7 +26,7 @@
buildInputs = [
xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
xorg.libXinerama xorg.libXrender xorg.libXrandr
- freetype alsaLib curl libjack2 pkg-config libGLU libGL lv2
+ freetype alsa-lib curl libjack2 pkg-config libGLU libGL lv2
];
CXXFLAGS = "-DHAVE_LROUND";
diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix
index b887615a30fc..c539a316422a 100644
--- a/pkgs/applications/audio/hybridreverb2/default.nix
+++ b/pkgs/applications/audio/hybridreverb2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsaLib, libjack2,
+{ lib, stdenv, fetchFromGitHub, fetchzip, cmake, pkg-config, lv2, alsa-lib, libjack2,
freetype, libX11, gtk3, pcre, libpthreadstubs, libXdmcp, libxkbcommon,
epoxy, at-spi2-core, dbus, curl, fftwFloat }:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config cmake ];
- buildInputs = [ lv2 alsaLib libjack2 freetype libX11 gtk3 pcre
+ buildInputs = [ lv2 alsa-lib libjack2 freetype libX11 gtk3 pcre
libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus curl fftwFloat ];
cmakeFlags = [
diff --git a/pkgs/applications/audio/hydrogen/0.nix b/pkgs/applications/audio/hydrogen/0.nix
index 1746715b834f..ad3566571b0c 100644
--- a/pkgs/applications/audio/hydrogen/0.nix
+++ b/pkgs/applications/audio/hydrogen/0.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, cmake
-, alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4
+, alsa-lib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [
- alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4
+ alsa-lib boost glib lash libjack2 libarchive libsndfile lrdf qt4
];
meta = with lib; {
diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index 490591ec9e62..319ee7a5f984 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook
-, alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf
+, alsa-lib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf
, qtbase, qttools, qtxmlpatterns
}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [
- alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf
+ alsa-lib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf
qtbase qttools qtxmlpatterns
];
diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
index 304f67e85aaf..f37150994fc4 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkg-config, qtbase, qtscript, qmake
+{ mkDerivation, lib, fetchFromGitHub, alsa-lib, pkg-config, qtbase, qtscript, qmake
}:
mkDerivation rec {
@@ -13,7 +13,7 @@ mkDerivation rec {
};
nativeBuildInputs = [ pkg-config qmake ];
- buildInputs = [ alsaLib qtbase qtscript ];
+ buildInputs = [ alsa-lib qtbase qtscript ];
qmakeFlags = [ "PREFIX=/" ];
diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/applications/audio/industrializer/default.nix
index f638eba3210e..91f7175e391a 100644
--- a/pkgs/applications/audio/industrializer/default.nix
+++ b/pkgs/applications/audio/industrializer/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchurl
-, alsaLib
+, alsa-lib
, audiofile
, autoconf
, automake
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
- alsaLib
+ alsa-lib
audiofile
autoconf
automake
diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix
index 035e15abb23f..48ffd5df5157 100644
--- a/pkgs/applications/audio/jaaa/default.nix
+++ b/pkgs/applications/audio/jaaa/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }:
+{ lib, stdenv, fetchurl, alsa-lib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, libjack2, zita-alsa-pcmi }:
stdenv.mkDerivation rec {
pname = "jaaa";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- alsaLib libclthreads libclxclient libX11 libXft libXrender fftwFloat libjack2 zita-alsa-pcmi
+ alsa-lib libclthreads libclxclient libX11 libXft libXrender fftwFloat libjack2 zita-alsa-pcmi
];
makeFlags = [
diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix
index ec62cb04c85e..520b55e96da5 100644
--- a/pkgs/applications/audio/jack-rack/default.nix
+++ b/pkgs/applications/audio/jack-rack/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }:
+{ lib, stdenv, fetchurl, pkg-config, libjack2, ladspaH, gtk2, alsa-lib, libxml2, lrdf }:
stdenv.mkDerivation rec {
name = "jack-rack-1.4.7";
src = fetchurl {
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 lrdf ];
+ buildInputs = [ libjack2 ladspaH gtk2 alsa-lib libxml2 lrdf ];
NIX_LDFLAGS = "-ldl -lm -lpthread";
meta = {
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix
index eecafe9e501f..e9d2abee91cd 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsaLib }:
+{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsa-lib }:
mkDerivation rec {
pname = "jackmix";
@@ -18,7 +18,7 @@ mkDerivation rec {
qtbase
lash
jack
- alsaLib
+ alsa-lib
];
installPhase = ''
diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix
index f45395eefa68..016f515ce13c 100644
--- a/pkgs/applications/audio/japa/default.nix
+++ b/pkgs/applications/audio/japa/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, libjack2, fftwFloat, libclthreads, libclxclient, libX11, libXft, zita-alsa-pcmi, }:
+{ lib, stdenv, fetchurl, alsa-lib, libjack2, fftwFloat, libclthreads, libclxclient, libX11, libXft, zita-alsa-pcmi, }:
stdenv.mkDerivation rec {
version = "0.9.2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1zmi4wg23hwsypg3h6y3qb72cbrihqcs19qrbzgs5a67d13q4897";
};
- buildInputs = [ alsaLib libjack2 fftwFloat libclthreads libclxclient libX11 libXft zita-alsa-pcmi ];
+ buildInputs = [ alsa-lib libjack2 fftwFloat libclthreads libclxclient libX11 libXft zita-alsa-pcmi ];
preConfigure = ''
cd ./source/
diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix
index 51c853809fdb..70b06e72fba8 100644
--- a/pkgs/applications/audio/kmetronome/default.nix
+++ b/pkgs/applications/audio/kmetronome/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, cmake, pkg-config, qttools, alsaLib, drumstick, qtbase, qtsvg }:
+{ lib, stdenv, fetchurl, cmake, pkg-config, qttools, alsa-lib, drumstick, qtbase, qtsvg }:
stdenv.mkDerivation rec {
pname = "kmetronome";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config qttools ];
- buildInputs = [ alsaLib drumstick qtbase qtsvg ];
+ buildInputs = [ alsa-lib drumstick qtbase qtsvg ];
dontWrapQtApps = true;
diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix
index 74bbeb9b7bb7..6c8ea6528f9b 100644
--- a/pkgs/applications/audio/lash/default.nix
+++ b/pkgs/applications/audio/lash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, gtk2, libjack2, libuuid, libxml2
+{ lib, stdenv, fetchurl, alsa-lib, gtk2, libjack2, libuuid, libxml2
, makeWrapper, pkg-config, readline }:
assert libuuid != null;
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
patches = [ ./socket.patch ./gcc-47.patch ];
nativeBuildInputs = [ pkg-config makeWrapper ];
- buildInputs = [ alsaLib gtk2 libjack2 libxml2 readline ];
+ buildInputs = [ alsa-lib gtk2 libjack2 libxml2 readline ];
propagatedBuildInputs = [ libuuid ];
NIX_LDFLAGS = "-lm -lpthread -luuid";
diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix
index 858d8e795e1c..61f709b33e15 100644
--- a/pkgs/applications/audio/librespot/default.nix
+++ b/pkgs/applications/audio/librespot/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, withRodio ? true
-, withALSA ? true, alsaLib ? null, withPulseAudio ? false, libpulseaudio ? null
+, withALSA ? true, alsa-lib ? null, withPulseAudio ? false, libpulseaudio ? null
, withPortAudio ? false, portaudio ? null }:
rustPlatform.buildRustPackage rec {
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ openssl ] ++ lib.optional withALSA alsaLib
+ buildInputs = [ openssl ] ++ lib.optional withALSA alsa-lib
++ lib.optional withPulseAudio libpulseaudio
++ lib.optional withPortAudio portaudio;
diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix
index 17a28315f192..22cab165ccf1 100644
--- a/pkgs/applications/audio/lingot/default.nix
+++ b/pkgs/applications/audio/lingot/default.nix
@@ -4,7 +4,7 @@
, intltool
, gtk3
, wrapGAppsHook
-, alsaLib
+, alsa-lib
, libjack2
, libpulseaudio
, fftw
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk3
- alsaLib
+ alsa-lib
libpulseaudio
fftw
] ++ lib.optional jackSupport libjack2;
diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix
index 91f14879dc73..1c33bff5b76e 100644
--- a/pkgs/applications/audio/linuxsampler/default.nix
+++ b/pkgs/applications/audio/linuxsampler/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, autoconf, automake, bison, libtool, pkg-config, which
-, alsaLib, asio, libjack2, libgig, libsndfile, lv2 }:
+, alsa-lib, asio, libjack2, libgig, libsndfile, lv2 }:
stdenv.mkDerivation rec {
pname = "linuxsampler";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake bison libtool pkg-config which ];
- buildInputs = [ alsaLib asio libjack2 libgig libsndfile lv2 ];
+ buildInputs = [ alsa-lib asio libjack2 libgig libsndfile lv2 ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 11a7d0cf3c6f..f791ad51bf9c 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, cmake, pkg-config, alsaLib ? null, fftwFloat, fltk13
+{ lib, fetchFromGitHub, cmake, pkg-config, alsa-lib ? null, fftwFloat, fltk13
, fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null
, libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null
, qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }:
@@ -18,7 +18,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake qttools pkg-config ];
buildInputs = [
- alsaLib
+ alsa-lib
fftwFloat
fltk13
fluidsynth_1
diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix
index 04d5bb0a6dd9..6f518dac9ca7 100644
--- a/pkgs/applications/audio/mamba/default.nix
+++ b/pkgs/applications/audio/mamba/default.nix
@@ -6,7 +6,7 @@
, fluidsynth
, libX11
, libjack2
-, alsaLib
+, alsa-lib
, liblo
, libsigcxx
, libsmf
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config xxd ];
- buildInputs = [ cairo fluidsynth libX11 libjack2 alsaLib liblo libsigcxx libsmf ];
+ buildInputs = [ cairo fluidsynth libX11 libjack2 alsa-lib liblo libsigcxx libsmf ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix
index 82f9b70c6181..e6b21dff2dc5 100644
--- a/pkgs/applications/audio/mhwaveedit/default.nix
+++ b/pkgs/applications/audio/mhwaveedit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsaLib, autoreconfHook, gtk2, libjack2, ladspaH
+{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsa-lib, autoreconfHook, gtk2, libjack2, ladspaH
, ladspaPlugins, libsamplerate, libsndfile, pkg-config, libpulseaudio, lame
, vorbis-tools }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
preAutoreconf = "(cd docgen && sh gendocs.sh)";
buildInputs = [
- SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile libpulseaudio
+ SDL alsa-lib gtk2 libjack2 ladspaH libsamplerate libsndfile libpulseaudio
];
configureFlags = [ "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa" ];
diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix
index 2e72a011921c..5db17b99d1c3 100644
--- a/pkgs/applications/audio/mid2key/default.nix
+++ b/pkgs/applications/audio/mid2key/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, libX11, libXi, libXtst, xorgproto }:
+{ lib, stdenv, fetchurl, alsa-lib, libX11, libXi, libXtst, xorgproto }:
stdenv.mkDerivation rec {
name = "mid2key-r1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
unpackPhase = "tar xvzf $src";
- buildInputs = [ alsaLib libX11 libXi libXtst xorgproto ];
+ buildInputs = [ alsa-lib libX11 libXi libXtst xorgproto ];
buildPhase = "make";
diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix
index 8f2e29ee95b4..93a215e46b1b 100644
--- a/pkgs/applications/audio/midas/generic.nix
+++ b/pkgs/applications/audio/midas/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, libX11, libXext, alsaLib, freetype, brand, type, version, homepage, url, sha256, ... }:
+{ stdenv, fetchurl, lib, libX11, libXext, alsa-lib, freetype, brand, type, version, homepage, url, sha256, ... }:
stdenv.mkDerivation rec {
inherit type;
baseName = "${type}-Edit";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
libPath = lib.makeLibraryPath [
libX11 # libX11.so.6
libXext # libXext.so.6
- alsaLib # libasound.so.2
+ alsa-lib # libasound.so.2
freetype # libfreetype.so.6
stdenv.cc.cc.lib # libstdc++.so.6
];
diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index b43694eb9c05..ce29a587d232 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper
-, SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }:
+, SDL2, alsa-lib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }:
stdenv.mkDerivation rec {
version = "1.03.00";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
- buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ];
+ buildInputs = [ SDL2 alsa-lib libjack2 lhasa perl rtmidi zlib zziplib ];
# Somehow this does not get set automatically
cmakeFlags = [ "-DSDL2MAIN_LIBRARY=${SDL2}/lib/libSDL2.so" ];
diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix
index 57af7a469a09..5ed51a998959 100644
--- a/pkgs/applications/audio/mimic/default.nix
+++ b/pkgs/applications/audio/mimic/default.nix
@@ -1,5 +1,5 @@
{ config, lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config
-, alsaLib, libtool, icu
+, alsa-lib, libtool, icu
, pulseaudioSupport ? config.pulseaudio or false, libpulseaudio }:
stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
libtool
icu
] ++ lib.optional pulseaudioSupport libpulseaudio;
diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix
index 9c49f26bb4ac..90821b014764 100644
--- a/pkgs/applications/audio/miniaudicle/default.nix
+++ b/pkgs/applications/audio/miniaudicle/default.nix
@@ -4,7 +4,7 @@
, bison
, flex
, which
-, alsaLib
+, alsa-lib
, libsndfile
, qt4
, qscintilla
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
libsndfile
qt4
qscintilla
diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix
index 783ef2dbb7dc..1d26782b6ae0 100644
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, pkg-config
, ncurses, db , popt, libtool
# Sound sub-systems
-, alsaSupport ? true, alsaLib
+, alsaSupport ? true, alsa-lib
, pulseSupport ? true, libpulseaudio, autoreconfHook
, jackSupport ? true, libjack2
, ossSupport ? true
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ ncurses db popt libtool ]
# Sound sub-systems
- ++ opt alsaSupport alsaLib
+ ++ opt alsaSupport alsa-lib
++ opt pulseSupport libpulseaudio
++ opt jackSupport libjack2
# Audio formats
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 153e8b9940b3..8f9489befc59 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv
, fetchurl
, makeWrapper
-, alsaLib
+, alsa-lib
, perl
, withConplay ? !stdenv.targetPlatform.isWindows
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = lib.optionals withConplay [ makeWrapper ];
buildInputs = lib.optionals withConplay [ perl ]
- ++ lib.optionals (!stdenv.isDarwin && !stdenv.targetPlatform.isWindows) [ alsaLib ];
+ ++ lib.optionals (!stdenv.isDarwin && !stdenv.targetPlatform.isWindows) [ alsa-lib ];
configureFlags = lib.optional
(stdenv.hostPlatform ? mpg123)
diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix
index 37f647a4a478..03aee52f2a90 100644
--- a/pkgs/applications/audio/mpg321/default.nix
+++ b/pkgs/applications/audio/mpg321/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, fetchpatch, libao, libmad, libid3tag, zlib, alsaLib
+{lib, stdenv, fetchurl, fetchpatch, libao, libmad, libid3tag, zlib, alsa-lib
# Specify default libao output plugin to use (e.g. "alsa", "pulse" …).
# If null, it will use the libao system default.
, defaultAudio ? null
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
"--with-default-audio=${defaultAudio}");
buildInputs = [libao libid3tag libmad zlib]
- ++ lib.optional stdenv.isLinux alsaLib;
+ ++ lib.optional stdenv.isLinux alsa-lib;
installTargets = [ "install" "install-man" ];
diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix
index da8dcb0b0c1d..773a9178c0bc 100644
--- a/pkgs/applications/audio/munt/default.nix
+++ b/pkgs/applications/audio/munt/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, alsaLib, makeDesktopItem, libjack2 }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, alsa-lib, makeDesktopItem, libjack2 }:
let
desktopItem = makeDesktopItem rec {
@@ -26,7 +26,7 @@ in mkDerivation rec {
dontFixCmake = true;
nativeBuildInputs = [ cmake ];
- buildInputs = [ qtbase alsaLib libjack2 ];
+ buildInputs = [ qtbase alsa-lib libjack2 ];
meta = with lib; {
description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices";
diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
index 22d66b18ddd8..f5a6bafe792c 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/applications/audio/muse/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools, wrapQtAppsHook
-, alsaLib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo
+, alsa-lib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo
, libsamplerate, libsndfile, lilv, lrdf, lv2, qtsvg, rtaudio, rubberband, sord
}:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
buildInputs = [
- alsaLib dssi fluidsynth ladspaH lash libinstpatch libjack2 liblo
+ alsa-lib dssi fluidsynth ladspaH lash libinstpatch libjack2 liblo
libsamplerate libsndfile lilv lrdf lv2 qtsvg rtaudio rubberband sord
];
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index b43b770b24f9..c2a2e7b96031 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
-, alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
+, alsa-lib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects
, qtquickcontrols2, qtscript, qtsvg, qttools
, qtwebengine, qtxmlpatterns
@@ -35,7 +35,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
- alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
+ alsa-lib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
portaudio portmidi # tesseract
qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2
qtscript qtsvg qttools qtwebengine qtxmlpatterns
diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix
index c8e18c03c1e5..2824832ef604 100644
--- a/pkgs/applications/audio/musikcube/default.nix
+++ b/pkgs/applications/audio/musikcube/default.nix
@@ -1,6 +1,6 @@
{ cmake
, pkg-config
-, alsaLib
+, alsa-lib
, boost
, curl
, fetchFromGitHub
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
pkg-config
];
buildInputs = [
- alsaLib
+ alsa-lib
boost
curl
ffmpeg
diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index aa56c9835589..0a887ebaf3db 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl, libiconv
-, withALSA ? true, alsaLib ? null
+, withALSA ? true, alsa-lib ? null
, withPulseAudio ? false, libpulseaudio ? null
, withPortAudio ? false, portaudio ? null
, withMPRIS ? false, dbus ? null
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ ncurses openssl ]
++ lib.optional stdenv.isDarwin libiconv
- ++ lib.optional withALSA alsaLib
+ ++ lib.optional withALSA alsa-lib
++ lib.optional withPulseAudio libpulseaudio
++ lib.optional withPortAudio portaudio
++ lib.optional withMPRIS dbus;
diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix
index 61353f45fec7..bf7d680ff157 100644
--- a/pkgs/applications/audio/netease-music-tui/default.nix
+++ b/pkgs/applications/audio/netease-music-tui/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, rustPlatform, lib, alsaLib, pkg-config, openssl }:
+{ fetchFromGitHub, rustPlatform, lib, alsa-lib, pkg-config, openssl }:
rustPlatform.buildRustPackage rec {
pname = "netease-music-tui";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoPatches = [ ./cargo-lock.patch ];
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsaLib openssl ];
+ buildInputs = [ alsa-lib openssl ];
cargoSha256 = "1pca0sz4rz8qls6k2vhf70ixhnvgk81c4hbx81q3pv106g5k205f";
diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/applications/audio/nootka/default.nix
index 11424c0be181..8b2284f9b30a 100644
--- a/pkgs/applications/audio/nootka/default.nix
+++ b/pkgs/applications/audio/nootka/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, cmake
-, alsaLib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch, qtbase
+, alsa-lib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch, qtbase
}:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [
- alsaLib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch qtbase
+ alsa-lib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch qtbase
];
cmakeFlags = [
diff --git a/pkgs/applications/audio/nootka/unstable.nix b/pkgs/applications/audio/nootka/unstable.nix
index aa49daaa1e71..edfb19483646 100644
--- a/pkgs/applications/audio/nootka/unstable.nix
+++ b/pkgs/applications/audio/nootka/unstable.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, cmake
-, alsaLib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch
+, alsa-lib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch
, qtbase, qtdeclarative, qtquickcontrols2
}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [
- alsaLib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch
+ alsa-lib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch
qtbase qtdeclarative qtquickcontrols2
];
diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix
index 68edf99e010a..7ad1e319bffe 100644
--- a/pkgs/applications/audio/ocenaudio/default.nix
+++ b/pkgs/applications/audio/ocenaudio/default.nix
@@ -5,7 +5,7 @@
, dpkg
, qt5
, libjack2
-, alsaLib
+, alsa-lib
, bzip2
, libpulseaudio }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
libjack2
libpulseaudio
bzip2
- alsaLib
+ alsa-lib
];
buildInputs = [ dpkg ];
diff --git a/pkgs/applications/audio/osmid/default.nix b/pkgs/applications/audio/osmid/default.nix
index f16b146e616a..1a65826dca33 100644
--- a/pkgs/applications/audio/osmid/default.nix
+++ b/pkgs/applications/audio/osmid/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv
, fetchFromGitHub
, cmake
-, alsaLib
+, alsa-lib
, libX11
}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- buildInputs = [ alsaLib libX11 ];
+ buildInputs = [ alsa-lib libX11 ];
installPhase = ''
runHook preInstall
diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
index f238a6876099..90e80f13ac48 100644
--- a/pkgs/applications/audio/padthv1/default.nix
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, pkg-config, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }:
+{ lib, fetchurl, pkg-config, libjack2, alsa-lib, libsndfile, liblo, lv2, qt5, fftwFloat, mkDerivation }:
mkDerivation rec {
pname = "padthv1";
@@ -9,7 +9,7 @@ mkDerivation rec {
sha256 = "1karrprb3ijrbiwpr43rl3nxnzc33lnmwrd1832psgr3flnr9fp5";
};
- buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ];
+ buildInputs = [ libjack2 alsa-lib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ];
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix
index 573b2262e73d..f37cf8c5b32d 100644
--- a/pkgs/applications/audio/patchage/default.nix
+++ b/pkgs/applications/audio/patchage/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm
+{ lib, stdenv, alsa-lib, boost, dbus-glib, fetchsvn, ganv, glibmm
, gtkmm2, libjack2, pkg-config, python2, wafHook
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
};
buildInputs = [
- alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2
+ alsa-lib boost dbus-glib ganv glibmm gtkmm2 libjack2
pkg-config python2 wafHook
];
diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix
index fb29f9b13e2b..f76720aff907 100644
--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/pkgs/applications/audio/petrifoo/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, cmake, gtk2, libjack2, libgnomecanvas
+{ lib, stdenv, fetchurl, alsa-lib, cmake, gtk2, libjack2, libgnomecanvas
, libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2
, pkg-config, openssl }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ alsaLib gtk2 libjack2 libgnomecanvas libpthreadstubs
+ buildInputs = [ alsa-lib gtk2 libjack2 libgnomecanvas libpthreadstubs
libsamplerate libsndfile libtool libxml2 openssl ];
meta = with lib; {
diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix
index f1d35d7e78e0..2c58ecc5dcbb 100644
--- a/pkgs/applications/audio/pianobooster/default.nix
+++ b/pkgs/applications/audio/pianobooster/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qttools
-, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook
+, alsa-lib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook
}:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
- buildInputs = [ alsaLib ftgl libGLU libjack2 qtbase rtmidi ];
+ buildInputs = [ alsa-lib ftgl libGLU libjack2 qtbase rtmidi ];
cmakeFlags = [
"-DOpenGL_GL_PREFERENCE=GLVND"
diff --git a/pkgs/applications/audio/picoloop/default.nix b/pkgs/applications/audio/picoloop/default.nix
index 519888982ce4..bd956963a468 100644
--- a/pkgs/applications/audio/picoloop/default.nix
+++ b/pkgs/applications/audio/picoloop/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, libpulseaudio, SDL2, SDL2_image, SDL2_ttf, alsaLib, libjack2 }:
+{ lib, stdenv, fetchFromGitHub, libpulseaudio, SDL2, SDL2_image, SDL2_ttf, alsa-lib, libjack2 }:
stdenv.mkDerivation rec {
pname = "picoloop";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
SDL2.dev
SDL2_image
SDL2_ttf
- alsaLib
+ alsa-lib
libjack2
];
diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix
index 28e9788acbf2..43f38ff84ed0 100644
--- a/pkgs/applications/audio/pmidi/default.nix
+++ b/pkgs/applications/audio/pmidi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib
+{ lib, stdenv, fetchurl, alsa-lib
, version ? "1.7.1"
, sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055"
}:
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = sourceSha256;
};
- buildInputs = [ alsaLib ];
+ buildInputs = [ alsa-lib ];
meta = with lib; {
homepage = "https://www.parabola.me.uk/alsa/pmidi.html";
diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix
index a331952aa81d..4656db7257eb 100644
--- a/pkgs/applications/audio/polyphone/default.nix
+++ b/pkgs/applications/audio/polyphone/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsaLib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }:
+{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsa-lib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg }:
mkDerivation rec {
version = "2.2.0";
@@ -12,7 +12,7 @@ mkDerivation rec {
};
buildInputs = [
- alsaLib
+ alsa-lib
libjack2
portaudio
libogg
diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index 1d3fd534dd21..239b62a40266 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, gtk2, pkg-config }:
+{ lib, stdenv, fetchurl, alsa-lib, gtk2, pkg-config }:
stdenv.mkDerivation rec {
pname = "praat";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsaLib gtk2 ];
+ buildInputs = [ alsa-lib gtk2 ];
meta = {
description = "Doing phonetics by computer";
diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix
index 72e8ba135dd3..22b2a355b5e7 100644
--- a/pkgs/applications/audio/pt2-clone/default.nix
+++ b/pkgs/applications/audio/pt2-clone/default.nix
@@ -2,7 +2,7 @@
, fetchFromGitHub
, cmake
, nixosTests
-, alsaLib
+, alsa-lib
, SDL2
}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ SDL2 ] ++ lib.optional stdenv.isLinux alsaLib;
+ buildInputs = [ SDL2 ] ++ lib.optional stdenv.isLinux alsa-lib;
passthru.tests = {
pt2-clone-opens = nixosTests.pt2-clone;
diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix
index 9bc6903e51b8..ebdc0388b965 100644
--- a/pkgs/applications/audio/puredata/default.nix
+++ b/pkgs/applications/audio/puredata/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, autoreconfHook, gettext, makeWrapper
-, alsaLib, libjack2, tk, fftw
+, alsa-lib, libjack2, tk, fftw
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
- buildInputs = [ alsaLib libjack2 fftw ];
+ buildInputs = [ alsa-lib libjack2 fftw ];
configureFlags = [
"--enable-alsa"
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 586dfeae7331..7196829afa0e 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,5 +1,5 @@
{ lib, mkDerivation, fetchFromGitHub
-, pkg-config, cmake, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras
+, pkg-config, cmake, alsa-lib, libjack2, dbus, qtbase, qttools, qtx11extras
# Enable jack session support
, jackSession ? false
}:
@@ -21,7 +21,7 @@ mkDerivation rec {
qtbase
qtx11extras
qttools
- alsaLib
+ alsa-lib
libjack2
dbus
];
diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix
index 4fa165a05a9c..618062dc2f37 100644
--- a/pkgs/applications/audio/qmidiarp/default.nix
+++ b/pkgs/applications/audio/qmidiarp/default.nix
@@ -5,7 +5,7 @@
, lv2
, pkg-config
, qt5
-, alsaLib
+, alsa-lib
, libjack2
}:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
lv2
libjack2
] ++ (with qt5; [
diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index ea5430a82a2f..51772cc135b5 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsaLib, libjack2 }:
+{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsa-lib, libjack2 }:
mkDerivation rec {
version = "0.9.1";
@@ -11,7 +11,7 @@ mkDerivation rec {
hardeningDisable = [ "format" ];
- buildInputs = [ qtbase qttools alsaLib libjack2 ];
+ buildInputs = [ qtbase qttools alsa-lib libjack2 ];
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix
index e24824985fa7..35aea5bd086b 100644
--- a/pkgs/applications/audio/qmidiroute/default.nix
+++ b/pkgs/applications/audio/qmidiroute/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, qt4, alsaLib }:
+{ lib, stdenv, fetchurl, pkg-config, qt4, alsa-lib }:
stdenv.mkDerivation rec {
version = "0.4.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ qt4 alsaLib ];
+ buildInputs = [ qt4 alsa-lib ];
meta = with lib; {
description = "MIDI event processor and router";
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 2ff145d45cf1..25d7857c3539 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -6,7 +6,7 @@
, libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile
, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi
# output plugins
-, alsaLib, libpulseaudio
+, alsa-lib, libpulseaudio
# effect plugins
, libsamplerate
}:
@@ -46,7 +46,7 @@ mkDerivation rec {
libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile
libcdio cdparanoia libcddb faad2 ffmpeg wildmidi
# output plugins
- alsaLib libpulseaudio
+ alsa-lib libpulseaudio
# effect plugins
libsamplerate
];
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index 417c478e9e5c..6d75c32a6667 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, alsaLib, fluidsynth, libjack2, autoconf, pkg-config
+{ lib, fetchurl, alsa-lib, fluidsynth, libjack2, autoconf, pkg-config
, mkDerivation, qtbase, qttools, qtx11extras
}:
@@ -13,7 +13,7 @@ mkDerivation rec {
nativeBuildInputs = [ autoconf pkg-config ];
- buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ];
+ buildInputs = [ alsa-lib fluidsynth libjack2 qtbase qttools qtx11extras ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index f19d0f70fdf4..b1d0928b86a0 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -1,4 +1,4 @@
-{ alsaLib
+{ alsa-lib
, aubio
, cmake
, dssi
@@ -45,7 +45,7 @@ mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
aubio
dssi
flac
diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix
index 8b5dd869e82e..6d5d1ca860d0 100644
--- a/pkgs/applications/audio/rakarrack/default.nix
+++ b/pkgs/applications/audio/rakarrack/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, alsaUtils, fltk, libjack2, libXft,
+{ lib, stdenv, fetchurl, alsa-lib, alsa-utils, fltk, libjack2, libXft,
libXpm, libjpeg, libpng, libsamplerate, libsndfile, zlib }:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
patches = [ ./fltk-path.patch ];
- buildInputs = [ alsaLib alsaUtils fltk libjack2 libXft libXpm libjpeg
+ buildInputs = [ alsa-lib alsa-utils fltk libjack2 libXft libXpm libjpeg
libpng libsamplerate libsndfile zlib ];
meta = with lib; {
diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 48504a312c47..705685811ff2 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -3,7 +3,7 @@
, autoPatchelfHook
, makeWrapper
-, alsaLib
+, alsa-lib
, gtk3
, lame
, ffmpeg
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6
gtk3
];
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index e874b63898a8..acd1d80c86d5 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib
+{ lib, stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsa-lib
, mpg123, releasePath ? null }:
with lib;
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
releasePath
else throw "Platform is not supported. Use instalation native to your platform https://www.renoise.com/";
- buildInputs = [ alsaLib libjack2 libX11 libXcursor libXext libXrandr ];
+ buildInputs = [ alsa-lib libjack2 libX11 libXcursor libXext libXrandr ];
installPhase = ''
cp -r Resources $out
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index b95e5fdc76d2..38d8a8769628 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, cmake, makedepend, perl, pkg-config, qttools, wrapQtAppsHook
-, dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsaLib
+, dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsa-lib
, liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }:
stdenv.mkDerivation (rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation (rec {
lirc
lrdf
qtbase
- alsaLib
+ alsa-lib
];
meta = with lib; {
diff --git a/pkgs/applications/audio/rymcast/default.nix b/pkgs/applications/audio/rymcast/default.nix
index 9f63dbe7bc27..92d3151c835c 100644
--- a/pkgs/applications/audio/rymcast/default.nix
+++ b/pkgs/applications/audio/rymcast/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchzip, autoPatchelfHook, makeWrapper
-, alsaLib, curl, gtk3, webkitgtk, zenity }:
+, alsa-lib, curl, gtk3, webkitgtk, zenity }:
stdenv.mkDerivation rec {
pname = "rymcast";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
- buildInputs = [ alsaLib curl gtk3 stdenv.cc.cc.lib webkitgtk zenity ];
+ buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk zenity ];
installPhase = ''
mkdir -p "$out/bin"
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 8f0a48081215..8c7070516862 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchurl, pkg-config, libjack2
-, alsaLib, liblo, libsndfile, lv2, qtbase, qttools
+, alsa-lib, liblo, libsndfile, lv2, qtbase, qttools
, rubberband
}:
@@ -14,7 +14,7 @@ mkDerivation rec {
nativeBuildInputs = [ qttools pkg-config ];
- buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qtbase rubberband ];
+ buildInputs = [ libjack2 alsa-lib liblo libsndfile lv2 qtbase rubberband ];
meta = with lib; {
description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";
diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix
index 7e276e072247..ba193f70194d 100644
--- a/pkgs/applications/audio/schismtracker/default.nix
+++ b/pkgs/applications/audio/schismtracker/default.nix
@@ -2,7 +2,7 @@
, stdenv
, fetchFromGitHub
, autoreconfHook
-, alsaLib
+, alsa-lib
, python
, SDL
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook python ];
- buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsaLib;
+ buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsa-lib;
meta = with lib; {
description = "Music tracker application, free reimplementation of Impulse Tracker";
diff --git a/pkgs/applications/audio/scream/default.nix b/pkgs/applications/audio/scream/default.nix
index 976ede5803d5..fb0ba9408d9e 100644
--- a/pkgs/applications/audio/scream/default.nix
+++ b/pkgs/applications/audio/scream/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, config, fetchFromGitHub, cmake, pkg-config
-, alsaSupport ? stdenv.isLinux, alsaLib
+, alsaSupport ? stdenv.isLinux, alsa-lib
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs = lib.optional pulseSupport libpulseaudio
- ++ lib.optional alsaSupport alsaLib;
+ ++ lib.optional alsaSupport alsa-lib;
nativeBuildInputs = [ cmake pkg-config ];
cmakeFlags = [
diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix
index 84eebfac6956..f586a1592f9c 100644
--- a/pkgs/applications/audio/seq24/default.nix
+++ b/pkgs/applications/audio/seq24/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkg-config }:
+{ lib, stdenv, fetchurl, alsa-lib, gtkmm2, libjack2, pkg-config }:
stdenv.mkDerivation rec {
pname = "seq24";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
patches = [ ./mutex_no_nameclash.patch ];
- buildInputs = [ alsaLib gtkmm2 libjack2 ];
+ buildInputs = [ alsa-lib gtkmm2 libjack2 ];
nativeBuildInputs = [ pkg-config ];
meta = with lib; {
diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix
index 71d70c2dd580..0132b9679004 100644
--- a/pkgs/applications/audio/seq66/default.nix
+++ b/pkgs/applications/audio/seq66/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, qttools, which
-, alsaLib, libjack2, liblo, qtbase
+, alsa-lib, libjack2, liblo, qtbase
}:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config qttools which ];
- buildInputs = [ alsaLib libjack2 liblo qtbase ];
+ buildInputs = [ alsa-lib libjack2 liblo qtbase ];
postPatch = ''
for d in libseq66/include libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/include seq_rtmidi/src Seqtool/src; do
diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix
index 613abbf3c128..67851611f76e 100644
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/pkgs/applications/audio/setbfree/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, alsaLib, freetype, ftgl, libjack2, libX11, lv2
+{ lib, stdenv, fetchzip, alsa-lib, freetype, ftgl, libjack2, libX11, lv2
, libGLU, libGL, pkg-config, ttf_bitstream_vera
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
- alsaLib freetype ftgl libjack2 libX11 lv2 libGLU libGL
+ alsa-lib freetype ftgl libjack2 libX11 lv2 libGLU libGL
ttf_bitstream_vera
];
diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix
index 65f21c136121..4f7e43ca004b 100644
--- a/pkgs/applications/audio/sidplayfp/default.nix
+++ b/pkgs/applications/audio/sidplayfp/default.nix
@@ -6,7 +6,7 @@
, pkg-config
, libsidplayfp
, alsaSupport ? stdenv.hostPlatform.isLinux
-, alsaLib
+, alsa-lib
, pulseSupport ? stdenv.hostPlatform.isLinux
, libpulseaudio
, out123Support ? stdenv.hostPlatform.isDarwin
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook perl pkg-config ];
buildInputs = [ libsidplayfp ]
- ++ lib.optional alsaSupport alsaLib
+ ++ lib.optional alsaSupport alsa-lib
++ lib.optional pulseSupport libpulseaudio
++ lib.optional out123Support mpg123;
diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix
index 9351d1b0db76..0299f66191ed 100644
--- a/pkgs/applications/audio/snapcast/default.nix
+++ b/pkgs/applications/audio/snapcast/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config
-, alsaLib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr
+, alsa-lib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr
, nixosTests }:
let
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
# not needed
buildInputs = [
boost17x
- alsaLib asio avahi flac libogg libvorbis
+ alsa-lib asio avahi flac libogg libvorbis
aixlog popl soxr
];
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 164f266462a8..4881360b82e6 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config
-, alsaLib, fftw, gsl, motif, xorg
+, alsa-lib, fftw, gsl, motif, xorg
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsaLib fftw gsl motif ]
+ buildInputs = [ alsa-lib fftw gsl motif ]
++ (with xorg; [ libXext libXft libXpm libXt ]);
configureFlags = [ "--with-motif" ];
diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix
index a8dfe759d625..39f706d1f24c 100644
--- a/pkgs/applications/audio/sndpeek/default.nix
+++ b/pkgs/applications/audio/sndpeek/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libsndfile, freeglut, alsaLib, mesa, libGLU, libX11, libXmu
+{ lib, stdenv, fetchurl, libsndfile, freeglut, alsa-lib, mesa, libGLU, libX11, libXmu
, libXext, libXi }:
stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [
freeglut
- alsaLib
+ alsa-lib
mesa
libGLU
libsndfile
diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/applications/audio/songrec/default.nix
index 81bd3c67d7dd..2928771b3ec7 100644
--- a/pkgs/applications/audio/songrec/default.nix
+++ b/pkgs/applications/audio/songrec/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, gtk3
, openssl
-, alsaLib
+, alsa-lib
, pkg-config
, ffmpeg
}:
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsaLib gtk3 openssl ffmpeg ];
+ buildInputs = [ alsa-lib gtk3 openssl ffmpeg ];
meta = with lib; {
description = "An open-source Shazam client for Linux, written in Rust";
diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix
index b88165f693a3..711444651c33 100644
--- a/pkgs/applications/audio/sonic-lineup/default.nix
+++ b/pkgs/applications/audio/sonic-lineup/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound
+{ lib, stdenv, fetchurl, alsa-lib, boost, bzip2, fftw, fftwFloat, libfishsound
, libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate
, libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto
, wrapQtAppsHook, pkg-config
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
- [ alsaLib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo
+ [ alsa-lib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo
libmad liboggz libpulseaudio libsamplerate libsndfile lrdf opusfile
portaudio rubberband serd sord capnproto
];
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index f2df119fcc68..43254e6c2b0e 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -1,6 +1,6 @@
# TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
-{ lib, stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
+{ lib, stdenv, fetchurl, alsa-lib, bzip2, fftw, libjack2, libX11, liblo
, libmad, lrdf, librdf_raptor, librdf_rasqal, libsamplerate
, libsndfile, pkg-config, libpulseaudio, qtbase, qtsvg, redland
, rubberband, serd, sord, vamp-plugin-sdk, fftwFloat
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config wrapQtAppsHook ];
buildInputs =
[ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband
- libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland
+ libsamplerate vamp-plugin-sdk alsa-lib librdf_raptor librdf_rasqal redland
serd
sord
# optional
diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix
index 135c042d538a..1cad71ae2973 100644
--- a/pkgs/applications/audio/sooperlooper/default.nix
+++ b/pkgs/applications/audio/sooperlooper/default.nix
@@ -14,7 +14,7 @@
, rubberband
, gettext
, ncurses
-, alsaLib
+, alsa-lib
, fftw
}:
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
rubberband
gettext
ncurses
- alsaLib
+ alsa-lib
fftw
];
diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix
index 71fc763a5c5d..3dc9089b241f 100644
--- a/pkgs/applications/audio/soundtracker/default.nix
+++ b/pkgs/applications/audio/soundtracker/default.nix
@@ -3,7 +3,7 @@
, pkg-config
, autoconf
, gtk2
-, alsaLib
+, alsa-lib
, SDL
, jack2
, audiofile
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
jack2
audiofile
goocanvas
- ] ++ lib.optional stdenv.isLinux alsaLib;
+ ] ++ lib.optional stdenv.isLinux alsa-lib;
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix
index afe669f38622..2859a2e942e2 100644
--- a/pkgs/applications/audio/spot/default.nix
+++ b/pkgs/applications/audio/spot/default.nix
@@ -13,7 +13,7 @@
, libhandy
, gtk3
, openssl
-, alsaLib
+, alsa-lib
, libpulseaudio
, wrapGAppsHook
}:
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
gtk3
libhandy
openssl
- alsaLib
+ alsa-lib
libpulseaudio
];
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 8656deb2f6aa..db0f69c80abe 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype
+{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, openssl, freetype
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
@@ -20,7 +20,7 @@ let
rev = "46";
deps = [
- alsaLib
+ alsa-lib
atk
at-spi2-atk
at-spi2-core
diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index 8a077918d4fd..e9de6cb3cf78 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, rustPackages, pkg-config, openssl
-, withALSA ? true, alsaLib
+, withALSA ? true, alsa-lib
, withPulseAudio ? false, libpulseaudio
, withPortAudio ? false, portaudio
, withMpris ? false
@@ -29,7 +29,7 @@ rustPackages.rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
- ++ lib.optional withALSA alsaLib
+ ++ lib.optional withALSA alsa-lib
++ lib.optional withPulseAudio libpulseaudio
++ lib.optional withPortAudio portaudio
++ lib.optional (withMpris || withKeyring) dbus;
diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix
index 600ba95947ab..31fe69b00de5 100644
--- a/pkgs/applications/audio/squeezelite/default.nix
+++ b/pkgs/applications/audio/squeezelite/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
-, alsaLib, flac, libmad, libvorbis, mpg123
+, alsa-lib, flac, libmad, libvorbis, mpg123
, dsdSupport ? true
, faad2Support ? true, faad2
, ffmpegSupport ? true, ffmpeg
@@ -33,7 +33,7 @@ in stdenv.mkDerivation {
sha256 = "024ypr1da2r079k3hgiifzd3d3wcfprhbl5zdm40zm0c7frzmr8i";
};
- buildInputs = [ alsaLib flac libmad libvorbis mpg123 ]
+ buildInputs = [ alsa-lib flac libmad libvorbis mpg123 ]
++ optional faad2Support faad2
++ optional ffmpegSupport ffmpeg
++ optional opusSupport opusfile
diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix
index aa4b4acf5145..d295689716b2 100644
--- a/pkgs/applications/audio/stochas/default.nix
+++ b/pkgs/applications/audio/stochas/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libXrandr, libXinerama, libXext, libXcursor, freetype, alsaLib, libjack2 }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libXrandr, libXinerama, libXext, libXcursor, freetype, alsa-lib, libjack2 }:
stdenv.mkDerivation rec {
pname = "stochas";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
- libX11 libXrandr libXinerama libXext libXcursor freetype alsaLib libjack2
+ libX11 libXrandr libXinerama libXext libXcursor freetype alsa-lib libjack2
];
installPhase = ''
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index c8ffba2c2a7a..5a5671ec7730 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -4,7 +4,7 @@
, fetchFromGitHub
, cmake
, pkg-config
-, alsaLib
+, alsa-lib
, boost
, chromaprint
, fftw
@@ -45,7 +45,7 @@ mkDerivation rec {
};
buildInputs = [
- alsaLib
+ alsa-lib
boost
chromaprint
fftw
diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix
index 577175fcff2a..7c5c378d2faf 100644
--- a/pkgs/applications/audio/sunvox/default.nix
+++ b/pkgs/applications/audio/sunvox/default.nix
@@ -1,7 +1,7 @@
-{ lib, stdenv, fetchurl, unzip, alsaLib, libX11, libXi, SDL2 }:
+{ lib, stdenv, fetchurl, unzip, alsa-lib, libX11, libXi, SDL2 }:
let
- libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libX11 libXi SDL2 ];
+ libPath = lib.makeLibraryPath [ stdenv.cc.cc alsa-lib libX11 libXi SDL2 ];
arch =
if stdenv.isAarch64
then "arm64"
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 50e16c355e2b..eecf8caee379 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }:
+{ mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, libjack2, alsa-lib, liblo, lv2 }:
mkDerivation rec {
pname = "synthv1";
@@ -9,7 +9,7 @@ mkDerivation rec {
sha256 = "047y2l7ipzv00ly54f074v6p043xjml7vz0svc7z81bhx74vs0ix";
};
- buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ];
+ buildInputs = [ qtbase qttools libjack2 alsa-lib liblo lv2 ];
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/applications/audio/tony/default.nix
index d8265c3161bc..aa18a5e397e4 100644
--- a/pkgs/applications/audio/tony/default.nix
+++ b/pkgs/applications/audio/tony/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, wrapQtAppsHook
-, alsaLib, boost, bzip2, fftw, fftwFloat, libX11, libfishsound, libid3tag
+, alsa-lib, boost, bzip2, fftw, fftwFloat, libX11, libfishsound, libid3tag
, libjack2, liblo, libmad, libogg, liboggz, libpulseaudio, libsamplerate
, libsndfile, lrdf, opusfile, qtbase, qtsvg, rubberband, serd, sord
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config wrapQtAppsHook ];
buildInputs = [
- alsaLib boost bzip2 fftw fftwFloat libX11 libfishsound libid3tag
+ alsa-lib boost bzip2 fftw fftwFloat libX11 libfishsound libid3tag
libjack2 liblo libmad libogg liboggz libpulseaudio libsamplerate
libsndfile lrdf opusfile qtbase qtsvg rubberband serd sord
];
diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix
index 26cfb8189805..9061c38f19c3 100644
--- a/pkgs/applications/audio/transcribe/default.nix
+++ b/pkgs/applications/audio/transcribe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, lib, wrapGAppsHook, alsaLib, atk, cairo, gdk-pixbuf
+{ stdenv, fetchzip, lib, wrapGAppsHook, alsa-lib, atk, cairo, gdk-pixbuf
, glib, gst_all_1, gtk3, libSM, libX11, libpng12, pango, zlib }:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
dontPatchELF = true;
libPath = with gst_all_1; lib.makeLibraryPath [
- stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsaLib
+ stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsa-lib
libX11 libSM libpng12 gstreamer gst-plugins-base zlib
];
diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix
index 71a91dc3105e..698a03b4a713 100644
--- a/pkgs/applications/audio/traverso/default.nix
+++ b/pkgs/applications/audio/traverso/default.nix
@@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchurl, cmake, pkg-config
-, alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio
+, alsa-lib, fftw, flac, lame, libjack2, libmad, libpulseaudio
, libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack
}:
mkDerivation {
@@ -12,7 +12,7 @@ mkDerivation {
};
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ alsaLib fftw flac.dev libjack2 lame
+ buildInputs = [ alsa-lib fftw flac.dev libjack2 lame
libmad libpulseaudio libsamplerate.dev libsndfile.dev libvorbis
portaudio qtbase wavpack ];
diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/applications/audio/tunefish/default.nix
index 6dc1eb339627..df7564abcf02 100644
--- a/pkgs/applications/audio/tunefish/default.nix
+++ b/pkgs/applications/audio/tunefish/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, python3
-, alsaLib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk
+, alsa-lib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk
}:
stdenv.mkDerivation {
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkg-config python3 ];
- buildInputs = [ alsaLib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ];
+ buildInputs = [ alsa-lib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ];
postPatch = ''
patchShebangs src/tunefish4/generate-lv2-ttl.py
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index c7e24b926c09..789b97507a18 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkg-config
-, alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi
+, alsa-lib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi
, libzip, rtaudio, rtmidi, speex, libsamplerate }:
let
@@ -75,7 +75,7 @@ with lib; stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ makeWrapper pkg-config ];
- buildInputs = [ alsaLib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ];
+ buildInputs = [ alsa-lib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ];
buildFlags = [ "Rack" ];
diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix
index 1cb9c0f18bff..c1e41e41284d 100644
--- a/pkgs/applications/audio/virtual-ans/default.nix
+++ b/pkgs/applications/audio/virtual-ans/default.nix
@@ -3,7 +3,7 @@
, libX11
, libXi
, libGL
-, alsaLib
+, alsa-lib
, SDL2
, autoPatchelfHook
}:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
libX11
libXi
libGL
- alsaLib
+ alsa-lib
SDL2
];
diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix
index 943bd0d8032b..ec6391562174 100644
--- a/pkgs/applications/audio/vkeybd/default.nix
+++ b/pkgs/applications/audio/vkeybd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, libX11, makeWrapper, tcl, tk }:
+{ lib, stdenv, fetchurl, alsa-lib, libX11, makeWrapper, tcl, tk }:
stdenv.mkDerivation rec {
pname = "vkeybd";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ alsaLib libX11 tcl tk ];
+ buildInputs = [ alsa-lib libX11 tcl tk ];
configurePhase = ''
mkdir -p $out/bin
diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix
index b6accf1993a7..6158f33713a0 100644
--- a/pkgs/applications/audio/xmp/default.nix
+++ b/pkgs/applications/audio/xmp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, alsaLib, libxmp }:
+{ lib, stdenv, fetchurl, pkg-config, alsa-lib, libxmp }:
stdenv.mkDerivation rec {
name = "xmp-4.1.0";
@@ -16,5 +16,5 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsaLib libxmp ];
+ buildInputs = [ alsa-lib libxmp ];
}
diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix
index b994f197e67b..0802a79df04a 100644
--- a/pkgs/applications/audio/xsynth-dssi/default.nix
+++ b/pkgs/applications/audio/xsynth-dssi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk2, libjack2,
+{ lib, stdenv, fetchurl, alsa-lib, autoconf, automake, dssi, gtk2, libjack2,
ladspaH, ladspaPlugins, liblo, pkg-config }:
stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk";
};
- buildInputs = [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH
+ buildInputs = [ alsa-lib autoconf automake dssi gtk2 libjack2 ladspaH
ladspaPlugins liblo pkg-config ];
installPhase = ''
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index e9e191112f9b..dfb6a419c3d5 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub , alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre
+{ lib, stdenv, fetchFromGitHub , alsa-lib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre
, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkg-config, zlib, xorg
}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "0bgcc5fbgwpdjircq00wlii30pakf45yzligpbnf02a554hh4j01";
};
buildInputs = [
- alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL
+ alsa-lib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL
minixml zlib xorg.libpthreadstubs pcre
];
diff --git a/pkgs/applications/audio/zita-ajbridge/default.nix b/pkgs/applications/audio/zita-ajbridge/default.nix
index 4b094864607c..db6fc7d33812 100644
--- a/pkgs/applications/audio/zita-ajbridge/default.nix
+++ b/pkgs/applications/audio/zita-ajbridge/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, libjack2, zita-alsa-pcmi, zita-resampler }:
+{ lib, stdenv, fetchurl, alsa-lib, libjack2, zita-alsa-pcmi, zita-resampler }:
stdenv.mkDerivation rec {
name = "zita-ajbridge-0.8.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0g5v0l0zmqh049mhv62n8s5bpm0yrlby7mkxxhs5qwadp8v4w9mw";
};
- buildInputs = [ alsaLib libjack2 zita-alsa-pcmi zita-resampler ];
+ buildInputs = [ alsa-lib libjack2 zita-alsa-pcmi zita-resampler ];
preConfigure = ''
cd ./source/
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index dfc3e600ec24..986e3215b93f 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -16,7 +16,7 @@
# Optional dependencies
, alsaSupport ? true
-, alsaLib
+, alsa-lib
, dssiSupport ? false
, dssi
, ladspaH
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake makeWrapper pkg-config ];
buildInputs = [ fftw liblo minixml zlib ]
- ++ lib.optionals alsaSupport [ alsaLib ]
+ ++ lib.optionals alsaSupport [ alsa-lib ]
++ lib.optionals dssiSupport [ dssi ladspaH ]
++ lib.optionals jackSupport [ libjack2 ]
++ lib.optionals lashSupport [ lash ]
diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix
index 8e32798dc435..08eeac760c0f 100644
--- a/pkgs/applications/blockchains/exodus/default.nix
+++ b/pkgs/applications/blockchains/exodus/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango,
-atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsaLib, dbus, at-spi2-atk,
+atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsa-lib, dbus, at-spi2-atk,
cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }:
stdenv.mkDerivation rec {
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
util-linux
xorg.libXrandr
xorg.libXScrnSaver
- alsaLib
+ alsa-lib
dbus.lib
at-spi2-atk
at-spi2-core
diff --git a/pkgs/applications/blockchains/parity-ui/env.nix b/pkgs/applications/blockchains/parity-ui/env.nix
index a878bbf2e3e3..8b7d706c013a 100644
--- a/pkgs/applications/blockchains/parity-ui/env.nix
+++ b/pkgs/applications/blockchains/parity-ui/env.nix
@@ -1,11 +1,11 @@
-{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
+{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk2, atk, pango, freetype, fontconfig
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }:
let
packages = [
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
- fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr nss
+ fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr nss
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 6d9182b9d61a..42e3b7588afb 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -1,6 +1,6 @@
{ channel, pname, version, build ? null, sha256Hash }:
-{ alsaLib
+{ alsa-lib
, bash
, buildFHSUserEnv
, cacert
@@ -121,7 +121,7 @@ let
libXrandr
# For Android emulator
- alsaLib
+ alsa-lib
dbus
expat
libpulseaudio
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index 53150e0ad61f..1ff8ea3f4162 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig
+{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
, gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk
, at-spi2-core, libdbusmenu, mesa
@@ -7,7 +7,7 @@
let
packages = [
stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3
- fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
+ fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr gconf nss
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix
index 9ccd549693bb..5b1fc966dd9b 100644
--- a/pkgs/applications/editors/bonzomatic/default.nix
+++ b/pkgs/applications/editors/bonzomatic/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, cmake, makeWrapper
-, alsaLib, fontconfig, mesa_glu, libXcursor, libXinerama, libXrandr, xorg
+, alsa-lib, fontconfig, mesa_glu, libXcursor, libXinerama, libXrandr, xorg
}:
stdenv.mkDerivation rec {
@@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [
- alsaLib fontconfig mesa_glu
+ alsa-lib fontconfig mesa_glu
libXcursor libXinerama libXrandr xorg.xinput xorg.libXi xorg.libXext
];
postFixup = ''
- wrapProgram $out/bin/bonzomatic --prefix LD_LIBRARY_PATH : "${alsaLib}/lib"
+ wrapProgram $out/bin/bonzomatic --prefix LD_LIBRARY_PATH : "${alsa-lib}/lib"
'';
meta = with lib; {
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix
index ad044d3968e8..1bae0a0c9702 100644
--- a/pkgs/applications/editors/emacs/generic.nix
+++ b/pkgs/applications/editors/emacs/generic.nix
@@ -9,7 +9,7 @@
{ stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm
, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
-, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
+, alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
, jansson, harfbuzz
, dontRecurseIntoAttrs ,emacsPackagesFor
, libgccjit, targetPlatform, makeWrapper # native-comp params
@@ -105,7 +105,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
buildInputs =
- [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext jansson harfbuzz.dev ]
+ [ ncurses gconf libxml2 gnutls alsa-lib acl gpm gettext jansson harfbuzz.dev ]
++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ]
++ lib.optionals withX
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg giflib libtiff libXft
diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix
index aa7b7b194486..38fb55ecf7bf 100644
--- a/pkgs/applications/editors/kodestudio/default.nix
+++ b/pkgs/applications/editors/kodestudio/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
, # Patchelf dependencies:
- alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU, libGL
+ alsa-lib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU, libGL
, openssl, xorg, zlib
}:
@@ -57,7 +57,7 @@ in
$out/kodestudio
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${libGL}/lib:${libGLU}/lib:${openssl.out}/lib" \
+ --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsa-lib}/lib:${libGL}/lib:${libGLU}/lib:${openssl.out}/lib" \
$out/resources/app/extensions/krom/Krom/linux/Krom
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index 52acc8ee50b8..b19b1ac2b68d 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, zlib, glib, alsaLib, makeDesktopItem
+{ stdenv, lib, fetchurl, zlib, glib, alsa-lib, makeDesktopItem
, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf
, cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify
}:
@@ -6,7 +6,7 @@
let
libPath = lib.makeLibraryPath [
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss
- fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr gnome2.GConf
+ fontconfig gdk-pixbuf cairo cups expat libgpgerror alsa-lib nspr gnome2.GConf
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr
xorg.libXcursor
diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix
index 90879b352e18..a48b5eae3de3 100644
--- a/pkgs/applications/editors/music/tuxguitar/default.nix
+++ b/pkgs/applications/editors/music/tuxguitar/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, swt, jdk, makeWrapper, alsaLib, jack2, fluidsynth, libpulseaudio }:
+{ lib, stdenv, fetchurl, swt, jdk, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio }:
let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux";
if stdenv.hostPlatform.system == "i686-linux" then
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
wrapProgram $out/bin/tuxguitar \
--set JAVA "${jdk}/bin/java" \
- --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsaLib jack2 fluidsynth libpulseaudio ]}" \
+ --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsa-lib jack2 fluidsynth libpulseaudio ]}" \
--prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar"
'';
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 515933533343..657ea55da60d 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, makeDesktopItem, fetchurl, unzip
-, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome
+, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsa-lib, cups, expat, udev, gnome
, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon
}:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
dbus
nss
nspr
- alsaLib
+ alsa-lib
cups
expat
udev
diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index e8ef97f949c4..05e94bb164c9 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook, wrapGAppsHook
# Dynamic libraries
-, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat
+, alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat
, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor
, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst
, libxcb, libuuid, libxshmfence, nspr, nss, pango, mesa
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
atk
at-spi2-atk
at-spi2-core
diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix
index acec5293101f..3db183b2531a 100644
--- a/pkgs/applications/graphics/fluxus/default.nix
+++ b/pkgs/applications/graphics/fluxus/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchFromGitLab
-, alsaLib
+, alsa-lib
, bzip2
, fftw
, freeglut
@@ -23,7 +23,7 @@
}:
let
libs = [
- alsaLib
+ alsa-lib
bzip2
fftw
freeglut
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- alsaLib
+ alsa-lib
fftw
freeglut.dev
freetype
diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix
index d8862525030e..2ccc6ed401df 100644
--- a/pkgs/applications/graphics/foxotron/default.nix
+++ b/pkgs/applications/graphics/foxotron/default.nix
@@ -13,7 +13,7 @@
, libXi
, libXext
, libGLU
-, alsaLib
+, alsa-lib
, fontconfig
, AVFoundation
, Carbon
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [ zlib ]
- ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext alsaLib fontconfig libGLU ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor libXi libXext alsa-lib fontconfig libGLU ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation Carbon Cocoa CoreAudio Kernel OpenGL ];
installPhase = ''
diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix
index 2ac507dc8707..1c4609ac55b7 100644
--- a/pkgs/applications/graphics/kodelife/default.nix
+++ b/pkgs/applications/graphics/kodelife/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchzip
-, alsaLib
+, alsa-lib
, glib
, gst_all_1
, libGLU, libGL
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
preFixup = let
libPath = lib.makeLibraryPath [
stdenv.cc.cc.lib
- alsaLib
+ alsa-lib
glib
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix
index ca51d74a0a14..b30dbab1570a 100644
--- a/pkgs/applications/graphics/openboard/default.nix
+++ b/pkgs/applications/graphics/openboard/default.nix
@@ -1,6 +1,6 @@
{ mkDerivation, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, qmake
, qtbase, qtxmlpatterns, qttools, qtwebkit, libGL, fontconfig, openssl, poppler
-, ffmpeg, libva, alsaLib, SDL, x264, libvpx, libvorbis, libtheora, libogg
+, ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg
, libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }:
let
@@ -52,7 +52,7 @@ in mkDerivation rec {
poppler
ffmpeg
libva
- alsaLib
+ alsa-lib
SDL
x264
libvpx
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index be3b07bf4cc7..5c5557d6d601 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, lib, makeWrapper, wrapGAppsHook,
# build dependencies
- alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig,
+ alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig,
freetype, gdk-pixbuf, glib, glibc, gtk3, libuuid, nspr, nss, pango,
xorg, systemd
}:
let
deps = [
- alsaLib
+ alsa-lib
atk
at-spi2-atk
at-spi2-core
diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix
index a3ae46cf1381..a34f5a22d069 100644
--- a/pkgs/applications/kde/kmix.nix
+++ b/pkgs/applications/kde/kmix.nix
@@ -2,7 +2,7 @@
mkDerivation, lib,
extra-cmake-modules, kdoctools,
kglobalaccel, kxmlgui, kcoreaddons,
- plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
+ plasma-framework, libpulseaudio, alsa-lib, libcanberra_kde
}:
mkDerivation {
@@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- alsaLib kglobalaccel kxmlgui kcoreaddons
+ alsa-lib kglobalaccel kxmlgui kcoreaddons
libcanberra_kde libpulseaudio plasma-framework
];
cmakeFlags = [ "-DKMIX_KF5_BUILD=1" ];
diff --git a/pkgs/applications/kde/kwave.nix b/pkgs/applications/kde/kwave.nix
index 125e79c2c3cf..43f41c345fdf 100644
--- a/pkgs/applications/kde/kwave.nix
+++ b/pkgs/applications/kde/kwave.nix
@@ -1,5 +1,5 @@
{ mkDerivation, lib, extra-cmake-modules, kdoctools, qtmultimedia, kcompletion, kconfig
-, kcrash, kiconthemes, kio, audiofile, libsamplerate, alsaLib, libpulseaudio, flac, id3lib
+, kcrash, kiconthemes, kio, audiofile, libsamplerate, alsa-lib, libpulseaudio, flac, id3lib
, libogg, libmad, libopus, libvorbis, fftw, librsvg, qtbase }:
mkDerivation {
@@ -17,7 +17,7 @@ mkDerivation {
extra-cmake-modules
];
buildInputs = [
- alsaLib
+ alsa-lib
audiofile
kcrash
kdoctools
diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix
index 580f6eda87e2..436e4d7831fd 100644
--- a/pkgs/applications/misc/1password-gui/default.nix
+++ b/pkgs/applications/misc/1password-gui/default.nix
@@ -2,7 +2,7 @@
, stdenv
, fetchurl
, makeWrapper
-, alsaLib
+, alsa-lib
, at-spi2-atk
, at-spi2-core
, atk
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
installPhase =
let rpath = lib.makeLibraryPath [
- alsaLib
+ alsa-lib
at-spi2-atk
at-spi2-core
atk
diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix
index 58fcf4cb10dd..90373b6b00c5 100644
--- a/pkgs/applications/misc/airtame/default.nix
+++ b/pkgs/applications/misc/airtame/default.nix
@@ -1,12 +1,12 @@
{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
-, alsaLib, atk, cairo, cups, curl, dbus, expat, ffmpeg_3, fontconfig, freetype
+, alsa-lib, atk, cairo, cups, curl, dbus, expat, ffmpeg_3, fontconfig, freetype
, gdk-pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite
, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender
, libXtst, libopus, libpulseaudio, libxcb, nspr, nss, pango, udev, x264
}:
let libPath = lib.makeLibraryPath [
- alsaLib atk cairo cups curl dbus expat ffmpeg_3 fontconfig freetype gdk-pixbuf
+ alsa-lib atk cairo cups curl dbus expat ffmpeg_3 fontconfig freetype gdk-pixbuf
glib glibc gnome2.GConf gtk2 libopus nspr nss pango stdenv.cc.cc udev x264
libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes
libXi libXrandr libXrender libXtst libpulseaudio libxcb
diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix
index 946150d2b881..9baf2d4d2f24 100644
--- a/pkgs/applications/misc/audio/sox/default.nix
+++ b/pkgs/applications/misc/audio/sox/default.nix
@@ -1,5 +1,5 @@
{ config, lib, stdenv, fetchurl, pkg-config, CoreAudio
-, enableAlsa ? true, alsaLib ? null
+, enableAlsa ? true, alsa-lib ? null
, enableLibao ? true, libao ? null
, enableLame ? config.sox.enableLame or false, lame ? null
, enableLibmad ? true, libmad ? null
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
patches = [ ./0001-musl-rewind-pipe-workaround.patch ];
buildInputs =
- optional (enableAlsa && stdenv.isLinux) alsaLib ++
+ optional (enableAlsa && stdenv.isLinux) alsa-lib ++
optional enableLibao libao ++
optional enableLame lame ++
optional enableLibmad libmad ++
diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix
index 65200d851770..dc8786dcce2b 100644
--- a/pkgs/applications/misc/authy/default.nix
+++ b/pkgs/applications/misc/authy/default.nix
@@ -1,4 +1,4 @@
-{ alsaLib, at-spi2-atk, at-spi2-core, atk, autoPatchelfHook, cairo, cups
+{ alsa-lib, at-spi2-atk, at-spi2-core, atk, autoPatchelfHook, cairo, cups
, dbus, electron_9, expat, fetchurl, gdk-pixbuf, glib, gtk3, lib
, libappindicator-gtk3, libdbusmenu-gtk3, libuuid, makeWrapper
, nspr, nss, pango, squashfsTools, stdenv, systemd, xorg
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
rev = "5";
buildInputs = [
- alsaLib
+ alsa-lib
at-spi2-atk
at-spi2-core
atk
diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix
index dab8ccb29b7d..16344d975fea 100644
--- a/pkgs/applications/misc/free42/default.nix
+++ b/pkgs/applications/misc/free42/default.nix
@@ -5,7 +5,7 @@
, copyDesktopItems
, pkg-config
, gtk3
-, alsaLib
+, alsa-lib
}:
stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ copyDesktopItems pkg-config ];
- buildInputs = [ gtk3 alsaLib ];
+ buildInputs = [ gtk3 alsa-lib ];
postPatch = ''
sed -i -e "s|/bin/ls|ls|" gtk/Makefile
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index b1c7949d258c..c9be607b3662 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }:
+{ lib, stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsa-lib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }:
let
ld_library_path = builtins.concatStringsSep ":" [
@@ -17,7 +17,7 @@ let
xorg.libXcomposite
xorg.libXdamage
xorg.libXtst
- alsaLib
+ alsa-lib
fontconfig
libSM
libICE
diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix
index c7238fb01551..19cb7f6c5526 100644
--- a/pkgs/applications/misc/lutris/fhsenv.nix
+++ b/pkgs/applications/misc/lutris/fhsenv.nix
@@ -95,7 +95,7 @@ in buildFHSUserEnv {
libao libevdev udev libgcrypt libxml2 libusb-compat-0_1 libpng libmpeg2 libv4l
libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio
libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib
- alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
+ alsa-lib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd
vulkan-loader xdg-utils sqlite gnutls p11-kit libbsd harfbuzz
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index dd3fb8545990..ef8023614802 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, perl
-, alsaLib, libevdev, libopus, udev, SDL2
+, alsa-lib, libevdev, libopus, udev, SDL2
, ffmpeg, pkg-config, xorg, libvdpau, libpulseaudio, libcec
, curl, expat, avahi, enet, libuuid, libva
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake perl ];
buildInputs = [
- alsaLib libevdev libopus udev SDL2
+ alsa-lib libevdev libopus udev SDL2
ffmpeg pkg-config xorg.libxcb libvdpau libpulseaudio libcec
xorg.libpthreadstubs curl expat avahi enet libuuid libva
];
diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix
index ad9baec8f992..b02abc2f2293 100644
--- a/pkgs/applications/misc/moonlight-qt/default.nix
+++ b/pkgs/applications/misc/moonlight-qt/default.nix
@@ -10,7 +10,7 @@
, libva
, libvdpau
, libxkbcommon
-, alsaLib
+, alsa-lib
, libpulseaudio
, openssl
, libopus
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
libva
libvdpau
libxkbcommon
- alsaLib
+ alsa-lib
libpulseaudio
openssl
libopus
diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix
index 03a83c1179b8..8fcd9e1a04fe 100644
--- a/pkgs/applications/misc/polar-bookshelf/default.nix
+++ b/pkgs/applications/misc/polar-bookshelf/default.nix
@@ -27,7 +27,7 @@
, libXScrnSaver
, nss
, nspr
-, alsaLib
+, alsa-lib
, cups
, fontconfig
, expat
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
libXScrnSaver
nss
nspr
- alsaLib
+ alsa-lib
cups
fontconfig
expat
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 2c431e68deed..099813483a4a 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -19,7 +19,7 @@
, xcbutilxrm
, makeWrapper
, removeReferencesTo
-, alsaLib
+, alsa-lib
, curl
, libmpdclient
, libpulseaudio
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
xcbutilwm
xcbutilxrm
]
- ++ lib.optional alsaSupport alsaLib
+ ++ lib.optional alsaSupport alsa-lib
++ lib.optional githubSupport curl
++ lib.optional mpdSupport libmpdclient
++ lib.optional pulseSupport libpulseaudio
diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
index 439af2b8c01e..d387468bcddc 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -1,5 +1,5 @@
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, pkg-config, udev
-, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1
+, qtmultimedia, qtscript, alsa-lib, ola, libftdi1, libusb-compat-0_1
, libsndfile, libmad
}:
@@ -24,7 +24,7 @@ mkDerivation rec {
nativeBuildInputs = [ qmake pkg-config ];
buildInputs = [
- udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad
+ udev qtmultimedia qtscript alsa-lib ola libftdi1 libusb-compat-0_1 libsndfile libmad
];
qmakeFlags = [ "INSTALLROOT=$(out)" ];
diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix
index b68a3a98e34c..2e1b94b6b6c7 100644
--- a/pkgs/applications/misc/sampler/default.nix
+++ b/pkgs/applications/misc/sampler/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, alsaLib }:
+{ lib, buildGoModule, fetchFromGitHub, alsa-lib }:
buildGoModule rec {
pname = "sampler";
@@ -17,7 +17,7 @@ buildGoModule rec {
subPackages = [ "." ];
- buildInputs = [ alsaLib ];
+ buildInputs = [ alsa-lib ];
meta = with lib; {
description = "Tool for shell commands execution, visualization and alerting";
diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix
index 6a60e81933b9..976aae781710 100644
--- a/pkgs/applications/misc/upwork/default.nix
+++ b/pkgs/applications/misc/upwork/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook
-, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype
+, alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype
, gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libcxx systemd libpulseaudio
- 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/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix
index 47d02a0cec93..375b802d5c16 100644
--- a/pkgs/applications/misc/yambar/default.nix
+++ b/pkgs/applications/misc/yambar/default.nix
@@ -5,7 +5,7 @@
, meson
, ninja
, scdoc
-, alsaLib
+, alsa-lib
, fcft
, json_c
, libmpdclient
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config meson ninja scdoc ];
buildInputs = [
- alsaLib
+ alsa-lib
fcft
json_c
libmpdclient
diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix
index e9e22741c412..2f52a432f4be 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 feff2a74b14e..7d666f5ba9f0 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 57cac0919129..156932aa13f1 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 fc7029933383..725205c5c209 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 a44fb2032f48..2d2073b80b04 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 13becfc4f629..53c461641dc1 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 a7b9ddd07d0d..ec03a77d2680 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 2028c5a7b207..0bad6c58d0a1 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 63f1958f4a6c..c76902acab67 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 dabe0fd373ee..4f8d813f0557 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 327fc5f31e2f..f9be7e9ec9aa 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 63d0d0b2978b..64a237480c65 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 0c6b33e04a22..03f0bf638180 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 b3cd9d8c140b..6e57e0e9423c 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 a155737499e8..a8b2b02f0bfd 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 6fac3657c7cb..d63318ecfaf7 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 6fe0e3b13b27..854cc18a47ff 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 cbbe74481c23..6a677c9e0d61 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 5fa5c2a28641..e2ace1a5d35f 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 058a96ea622e..5b14fba5b420 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/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
index 111a3ed091e1..c20ec46f266d 100644
--- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix
@@ -2,7 +2,7 @@
, stdenv
, fetchurl
, bundlerEnv
-, alsaUtils
+, alsa-utils
, atk
, copyDesktopItems
, gobject-introspection
@@ -87,11 +87,11 @@ with mikutterPaths; stdenv.mkDerivation rec {
libnotify
which # some plugins use it at runtime
wrappedRuby
- ] ++ lib.optionals stdenv.isLinux [ alsaUtils ];
+ ] ++ lib.optionals stdenv.isLinux [ alsa-utils ];
scriptPath = lib.makeBinPath (
[ wrappedRuby libnotify which ]
- ++ lib.optionals stdenv.isLinux [ alsaUtils ]
+ ++ lib.optionals stdenv.isLinux [ alsa-utils ]
);
postUnpack = ''
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
index bad54f455b08..94e0dc9c8c2f 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 6d6e70ff26a0..dbcd447d156d 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 63cefbd2ffd1..ed02def3eb88 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 67a52113df32..616a08571024 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 8caafdd57624..4eb536256240 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 4db4580f58ac..137783552112 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 47027da9a919..026dc5b64056 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 d2648eff57cc..048d40082daa 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 c88c97705fd9..02330d110788 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 27af9698788e..acdf4e660c7c 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 6bd72134e027..614183b72d08 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 8b306c075062..01c83ba7b1cc 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 7496063c58ee..66d33533a736 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 96ae3993b383..51b119aa6de5 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 ba0f867b2aa1..371ac91120b5 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 364e6e294ec0..191176e539e8 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 0c18ec60ab65..ad202871b991 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 29667eb52c60..6c0de05a7404 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 b81128545d59..f3634b744aa4 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 31a15d69487e..8e28190fea4c 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 68a9362b87fd..33030e0c7eec 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 088391ba48f7..e0c5b50be0f3 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 bd9371fff134..b3968ed86045 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 dc7b0b0a4c8d..84e52128b667 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 8a96cf84755b..506f129d3596 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 8e0f4dde8168..942090f2bdf0 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
diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index 4eb39f4d1f82..b87e74c256f6 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, wrapGAppsHook, gtk3, gsettings-desktop-schemas
-, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsaLib, cairo, freetype, pango, gdk-pixbuf, glib }:
+, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsa-lib, cairo, freetype, pango, gdk-pixbuf, glib }:
stdenv.mkDerivation rec {
version = "5.1";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
buildInputs = [ gsettings-desktop-schemas ] ++ systemLibs;
- systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsaLib cairo freetype pango gdk-pixbuf glib ];
+ systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsa-lib cairo freetype pango gdk-pixbuf glib ];
systemLibPaths = lib.makeLibraryPath systemLibs;
installPhase = ''
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index b38b7e0e585c..3b9963d8dbc7 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -1,6 +1,6 @@
{ fetchurl, lib, stdenv, mkDerivation, dpkg, which
, makeWrapper
-, alsaLib
+, alsa-lib
, desktop-file-utils
, dbus
, libcap
@@ -59,7 +59,7 @@ let
qtquickcontrols
qtwebkit
qtwebengine
- alsaLib
+ alsa-lib
dbus
freetype
fontconfig
diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix
index daa71bff0612..75e6924db9c5 100644
--- a/pkgs/applications/office/onlyoffice-bin/default.nix
+++ b/pkgs/applications/office/onlyoffice-bin/default.nix
@@ -2,7 +2,7 @@
, lib
, fetchurl
# Alphabetic ordering below
-, alsaLib
+, alsa-lib
, at-spi2-atk
, atk
, autoPatchelfHook
@@ -87,7 +87,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
at-spi2-atk
atk
cairo
diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix
index b18f22b6c1dc..ada2804ccba4 100644
--- a/pkgs/applications/office/wpsoffice/default.nix
+++ b/pkgs/applications/office/wpsoffice/default.nix
@@ -5,7 +5,7 @@
, dpkg
, wrapGAppsHook
, wrapQtAppsHook
-, alsaLib
+, alsa-lib
, atk
, bzip2
, cairo
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
};
buildInputs = with xorg; [
- alsaLib
+ alsa-lib
atk
bzip2
cairo
diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix
index 4f8ca550490a..7b8f60819c47 100644
--- a/pkgs/applications/radio/direwolf/default.nix
+++ b/pkgs/applications/radio/direwolf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, alsaLib, espeak, glibc, gpsd
+{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, espeak, glibc, gpsd
, hamlib, perl, python3, udev }:
with lib;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [
espeak gpsd hamlib perl python3
- ] ++ (optionals stdenv.isLinux [alsaLib udev]);
+ ] ++ (optionals stdenv.isLinux [alsa-lib udev]);
patches = [
./udev-fix.patch
diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix
index d14e0017f6d3..36f020ed2726 100644
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/pkgs/applications/radio/fldigi/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, hamlib, fltk14, libjpeg, libpng, portaudio, libsndfile,
- libsamplerate, libpulseaudio, libXinerama, gettext, pkg-config, alsaLib }:
+ libsamplerate, libpulseaudio, libXinerama, gettext, pkg-config, alsa-lib }:
stdenv.mkDerivation rec {
version = "4.1.18";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio
- libsndfile libsamplerate libpulseaudio pkg-config alsaLib ];
+ libsndfile libsamplerate libpulseaudio pkg-config alsa-lib ];
meta = {
description = "Digital modem program";
diff --git a/pkgs/applications/radio/gnuradio/3.7.nix b/pkgs/applications/radio/gnuradio/3.7.nix
index 50993dd6f8ef..3e423e025b76 100644
--- a/pkgs/applications/radio/gnuradio/3.7.nix
+++ b/pkgs/applications/radio/gnuradio/3.7.nix
@@ -17,7 +17,7 @@
, codec2
, gsm
, fftwFloat
-, alsaLib
+, alsa-lib
, libjack2
, CoreAudio
, uhd
@@ -143,7 +143,7 @@ let
};
gr-audio = {
runtime = []
- ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ]
+ ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ]
++ lib.optionals stdenv.isDarwin [ CoreAudio ]
;
cmakeEnableFlag = "GR_AUDIO";
diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix
index 9f90d3c03535..f20ffe01bdc9 100644
--- a/pkgs/applications/radio/gnuradio/3.8.nix
+++ b/pkgs/applications/radio/gnuradio/3.8.nix
@@ -16,7 +16,7 @@
, codec2
, gsm
, fftwFloat
-, alsaLib
+, alsa-lib
, libjack2
, CoreAudio
, uhd
@@ -149,7 +149,7 @@ let
};
gr-audio = {
runtime = []
- ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ]
+ ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ]
++ lib.optionals stdenv.isDarwin [ CoreAudio ]
;
cmakeEnableFlag = "GR_AUDIO";
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix
index d622fef424d2..528ea1264538 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@@ -16,7 +16,7 @@
, codec2
, gsm
, fftwFloat
-, alsaLib
+, alsa-lib
, libjack2
, CoreAudio
, uhd
@@ -151,7 +151,7 @@ let
};
gr-audio = {
runtime = []
- ++ lib.optionals stdenv.isLinux [ alsaLib libjack2 ]
+ ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ]
++ lib.optionals stdenv.isDarwin [ CoreAudio ]
;
cmakeEnableFlag = "GR_AUDIO";
diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index cccdff1f3cc8..272c381db897 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -7,7 +7,7 @@
, log4cpp
, mpir
, fftwFloat
-, alsaLib
+, alsa-lib
, libjack2
# drivers (optional):
, rtl-sdr
@@ -37,7 +37,7 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec {
log4cpp
mpir
fftwFloat
- alsaLib
+ alsa-lib
libjack2
gnuradio3_8Minimal.unwrapped.boost
qt5.qtbase
diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/applications/radio/minimodem/default.nix
index 48068a342e2e..c023e76b273e 100644
--- a/pkgs/applications/radio/minimodem/default.nix
+++ b/pkgs/applications/radio/minimodem/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, libtool
-, fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio
+, fftw, fftwSinglePrec, alsa-lib, libsndfile, libpulseaudio
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config autoconf automake libtool ];
- buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ];
+ buildInputs = [ fftw fftwSinglePrec alsa-lib libsndfile libpulseaudio ];
preConfigure = ''
aclocal \
diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix
index 64f5093c4b98..77a7d8cf69f4 100644
--- a/pkgs/applications/radio/pothos/default.nix
+++ b/pkgs/applications/radio/pothos/default.nix
@@ -13,7 +13,7 @@
, nlohmann_json
, soapysdr-with-plugins
, portaudio
-, alsaLib
+, alsa-lib
, muparserx
, python3
}:
@@ -39,7 +39,7 @@ mkDerivation rec {
buildInputs = [
pcre poco qtbase qtsvg libsForQt5.qwt nlohmann_json
- soapysdr-with-plugins portaudio alsaLib muparserx python3
+ soapysdr-with-plugins portaudio alsa-lib muparserx python3
];
postInstall = ''
diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix
index e6fa95b5dc78..555264ac4850 100644
--- a/pkgs/applications/radio/qsstv/default.nix
+++ b/pkgs/applications/radio/qsstv/default.nix
@@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchurl, qtbase, qmake, openjpeg, pkg-config, fftw,
- libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }:
+ libpulseaudio, alsa-lib, hamlib, libv4l, fftwFloat }:
mkDerivation rec {
version = "9.4.4";
@@ -17,7 +17,7 @@ mkDerivation rec {
pkg-config
];
- buildInputs = [ qtbase openjpeg fftw libpulseaudio alsaLib hamlib libv4l
+ buildInputs = [ qtbase openjpeg fftw libpulseaudio alsa-lib hamlib libv4l
fftwFloat ];
postInstall = ''
diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix
index 19a4e715013d..75fb91d5ce6a 100644
--- a/pkgs/applications/radio/quisk/default.nix
+++ b/pkgs/applications/radio/quisk/default.nix
@@ -1,5 +1,5 @@
{ lib, python38Packages, fetchPypi
-, fftw, alsaLib, pulseaudio, wxPython_4_0 }:
+, fftw, alsa-lib, pulseaudio, wxPython_4_0 }:
python38Packages.buildPythonApplication rec {
pname = "quisk";
@@ -10,7 +10,7 @@ python38Packages.buildPythonApplication rec {
sha256 = "37dfb02a32341025c086b07d66ddf1608d4ee1ae1c62fb51f87c97662f13e0d8";
};
- buildInputs = [ fftw alsaLib pulseaudio ];
+ buildInputs = [ fftw alsa-lib pulseaudio ];
propagatedBuildInputs = [ wxPython_4_0 ];
diff --git a/pkgs/applications/radio/soapyaudio/default.nix b/pkgs/applications/radio/soapyaudio/default.nix
index e12cced055c2..74924de241d3 100644
--- a/pkgs/applications/radio/soapyaudio/default.nix
+++ b/pkgs/applications/radio/soapyaudio/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
-, hamlib, rtaudio, alsaLib, libpulseaudio, libjack2, libusb1, soapysdr
+, hamlib, rtaudio, alsa-lib, libpulseaudio, libjack2, libusb1, soapysdr
} :
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ hamlib rtaudio alsaLib libpulseaudio libjack2 libusb1 soapysdr ];
+ buildInputs = [ hamlib rtaudio alsa-lib libpulseaudio libjack2 libusb1 soapysdr ];
cmakeFlags = [
"-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/"
diff --git a/pkgs/applications/radio/soundmodem/default.nix b/pkgs/applications/radio/soundmodem/default.nix
index 7f1332a45a6a..bedcc8b02c4e 100644
--- a/pkgs/applications/radio/soundmodem/default.nix
+++ b/pkgs/applications/radio/soundmodem/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, alsaLib, audiofile, gtk2, libxml2 }:
+{ lib, stdenv, fetchurl, pkg-config, alsa-lib, audiofile, gtk2, libxml2 }:
stdenv.mkDerivation rec {
name = "soundmodem";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsaLib audiofile gtk2 libxml2 ];
+ buildInputs = [ alsa-lib audiofile gtk2 libxml2 ];
patches = [ ./matFix.patch ];
diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix
index d6a82049a23d..255f7761be92 100644
--- a/pkgs/applications/radio/svxlink/default.nix
+++ b/pkgs/applications/radio/svxlink/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, cmake, pkg-config, fetchFromGitHub, makeDesktopItem, alsaLib, speex
+{ lib, stdenv, cmake, pkg-config, fetchFromGitHub, makeDesktopItem, alsa-lib, speex
, libopus, curl, gsm, libgcrypt, libsigcxx, popt, qtbase, qttools
, wrapQtAppsHook, rtl-sdr, tcl, doxygen, groff }:
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config doxygen groff wrapQtAppsHook ];
buildInputs = [
- alsaLib
+ alsa-lib
curl
gsm
libgcrypt
diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix
index cdb84670c616..8d28215ae251 100644
--- a/pkgs/applications/radio/unixcw/default.nix
+++ b/pkgs/applications/radio/unixcw/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, libpulseaudio, alsaLib , pkg-config, qt5}:
+{lib, stdenv, fetchurl, libpulseaudio, alsa-lib , pkg-config, qt5}:
stdenv.mkDerivation rec {
pname = "unixcw";
version = "3.5.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
patches = [
./remove-use-of-dlopen.patch
];
- buildInputs = [libpulseaudio alsaLib pkg-config qt5.qtbase];
+ buildInputs = [libpulseaudio alsa-lib pkg-config qt5.qtbase];
CFLAGS ="-lasound -lpulse-simple";
dontWrapQtApps = true;
diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
index 8e04d72780ca..c33bfd408b92 100644
--- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
+++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, pkg-config, autoreconfHook,
glib, libzip, libserialport, check, libusb1, libftdi,
-systemd, alsaLib, dsview
+systemd, alsa-lib, dsview
}:
stdenv.mkDerivation {
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [
- glib libzip libserialport libusb1 libftdi systemd check alsaLib
+ glib libzip libserialport libusb1 libftdi systemd check alsa-lib
];
meta = with lib; {
diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix
index 58873b8a7701..0628134d9df2 100644
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, mkDerivation, fetchurl, makeDesktopItem
, libXrender, libXrandr, libXcursor, libX11, libXext, libXi, libxcb
- , libGL, glib, nss, nspr, expat, alsaLib
+ , libGL, glib, nss, nspr, expat, alsa-lib
, qtbase, qtdeclarative, qtsvg, qtlocation, qtwebchannel, qtwebengine
}:
let
libPath = lib.makeLibraryPath
[ libXrender libXrandr libXcursor libX11 libXext libXi libxcb
- libGL glib nss nspr expat alsaLib
+ libGL glib nss nspr expat alsa-lib
qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine
];
in
@@ -32,7 +32,7 @@ let
buildInputs =
[ libXrender libXrandr libXcursor libX11 libXext libXi libxcb
- libGL glib nss nspr expat alsaLib
+ libGL glib nss nspr expat alsa-lib
qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine
];
diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix
index 9a8f05bc575f..6fed10da18bc 100644
--- a/pkgs/applications/science/math/mathematica/10.nix
+++ b/pkgs/applications/science/math/mathematica/10.nix
@@ -2,7 +2,7 @@
, coreutils
, patchelf
, requireFile
-, alsaLib
+, alsa-lib
, fontconfig
, freetype
, gcc
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
buildInputs = [
coreutils
patchelf
- alsaLib
+ alsa-lib
coreutils
fontconfig
freetype
diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix
index b8270cca9085..f6f0046d2725 100644
--- a/pkgs/applications/science/math/mathematica/11.nix
+++ b/pkgs/applications/science/math/mathematica/11.nix
@@ -3,7 +3,7 @@
, patchelf
, requireFile
, callPackage
-, alsaLib
+, alsa-lib
, dbus
, fontconfig
, freetype
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [
coreutils
patchelf
- alsaLib
+ alsa-lib
coreutils
dbus
fontconfig
diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix
index 43d7853e3d9a..88db3c4b2e92 100644
--- a/pkgs/applications/science/math/mathematica/9.nix
+++ b/pkgs/applications/science/math/mathematica/9.nix
@@ -2,7 +2,7 @@
, coreutils
, patchelf
, requireFile
-, alsaLib
+, alsa-lib
, fontconfig
, freetype
, gcc
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
buildInputs = [
coreutils
patchelf
- alsaLib
+ alsa-lib
coreutils
fontconfig
freetype
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 497592f1c068..10301f062e57 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -4,7 +4,7 @@
, requireFile
, callPackage
, makeWrapper
-, alsaLib
+, alsa-lib
, dbus
, fontconfig
, freetype
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
coreutils
patchelf
makeWrapper
- alsaLib
+ alsa-lib
coreutils
dbus
fontconfig
diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix
index e048b881d33d..0f5e7e6daa85 100644
--- a/pkgs/applications/science/robotics/apmplanner2/default.nix
+++ b/pkgs/applications/science/robotics/apmplanner2/default.nix
@@ -1,6 +1,6 @@
{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake
, qtbase, qtscript, qtwebkit, qtserialport, qtsvg, qtdeclarative, qtquickcontrols2
-, alsaLib, libsndfile, flite, openssl, udev, SDL2
+, alsa-lib, libsndfile, flite, openssl, udev, SDL2
}:
mkDerivation rec {
@@ -15,7 +15,7 @@ mkDerivation rec {
};
buildInputs = [
- alsaLib libsndfile flite openssl udev SDL2
+ alsa-lib libsndfile flite openssl udev SDL2
qtbase qtscript qtwebkit qtserialport qtsvg qtdeclarative qtquickcontrols2
];
diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix
index 7dd495f977ae..55798ed60997 100644
--- a/pkgs/applications/terminal-emulators/hyper/default.nix
+++ b/pkgs/applications/terminal-emulators/hyper/default.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk3, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
-, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio, at-spi2-atk }:
+, libxcb, nss, nspr, alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk }:
let
libPath = lib.makeLibraryPath [
stdenv.cc.cc gtk3 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
- libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio
+ libXrender libX11 libXtst libXScrnSaver nss nspr alsa-lib cups expat udev libpulseaudio
at-spi2-atk
];
in
diff --git a/pkgs/applications/terminal-emulators/terminus/default.nix b/pkgs/applications/terminal-emulators/terminus/default.nix
index 87394241ef76..7631282b3af6 100644
--- a/pkgs/applications/terminal-emulators/terminus/default.nix
+++ b/pkgs/applications/terminal-emulators/terminus/default.nix
@@ -2,13 +2,13 @@
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, libxcb, makeWrapper, nodejs
-, nss, nspr, alsaLib, cups, expat, systemd, libpulseaudio }:
+, nss, nspr, alsa-lib, cups, expat, systemd, libpulseaudio }:
let
libPath = lib.makeLibraryPath [
stdenv.cc.cc gtk2 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
- libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat systemd libpulseaudio
+ libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsa-lib cups expat systemd libpulseaudio
];
in
stdenv.mkDerivation rec {
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 2f19e0693c49..c0cc9d5e2b11 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib
+{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsa-lib
, libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig
, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
, nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
nss
nspr
cups
- alsaLib
+ alsa-lib
expat
gdk-pixbuf
dbus
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index 7d041f60f48f..133840e066bb 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -30,7 +30,7 @@
, openal ? null
, alsaSupport ? stdenv.isLinux
-, alsaLib ? null
+, alsa-lib ? null
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux
, libpulseaudio ? null
@@ -42,7 +42,7 @@
assert spellcheckSupport -> (hunspell != null);
assert automationSupport -> (lua != null);
assert openalSupport -> (openal != null);
-assert alsaSupport -> (alsaLib != null);
+assert alsaSupport -> (alsa-lib != null);
assert pulseaudioSupport -> (libpulseaudio != null);
assert portaudioSupport -> (portaudio != null);
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
wxGTK
zlib
]
- ++ optional alsaSupport alsaLib
+ ++ optional alsaSupport alsa-lib
++ optional automationSupport lua
++ optional openalSupport openal
++ optional portaudioSupport portaudio
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 9b2073bc799e..fe767759a82b 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -2,7 +2,7 @@
, zlib, gettext, libvdpau, libva, libXv, sqlite
, yasm, freetype, fontconfig, fribidi
, makeWrapper, libXext, libGLU, qttools, qtbase, wrapQtAppsHook
-, alsaLib
+, alsa-lib
, withX265 ? true, x265
, withX264 ? true, x264
, withXvid ? true, xvidcore
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
++ lib.optional withQT wrapQtAppsHook;
buildInputs = [
zlib gettext libvdpau libva libXv sqlite fribidi fontconfig
- freetype alsaLib libXext libGLU makeWrapper
+ freetype alsa-lib libXext libGLU makeWrapper
] ++ lib.optional withX264 x264
++ lib.optional withX265 x265
++ lib.optional withXvid xvidcore
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix
index c81811ea9379..75d3cdbcc667 100644
--- a/pkgs/applications/video/cinelerra/default.nix
+++ b/pkgs/applications/video/cinelerra/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool
-, pkg-config, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394
+, pkg-config, faad2, faac, a52dec, alsa-lib, fftw, lame, libavc1394
, libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg
, libtiff, freetype, mjpegtools, x264, gettext, openexr
, libXext, libXxf86vm, libXv, libXi, libX11, libXft, xorgproto, libtheora, libpng
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ automake autoconf libtool pkg-config file intltool ];
buildInputs =
[ faad2 faac
- a52dec alsaLib fftw lame libavc1394 libiec61883
+ a52dec alsa-lib fftw lame libavc1394 libiec61883
libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype
mjpegtools x264 gettext openexr
libXext libXxf86vm libXv libXi libX11 libXft xorgproto
diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/pkgs/applications/video/clickshare-csc1/default.nix
index e4e72704fb0b..09b24663080b 100644
--- a/pkgs/applications/video/clickshare-csc1/default.nix
+++ b/pkgs/applications/video/clickshare-csc1/default.nix
@@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchurl
-, alsaLib
+, alsa-lib
, autoPatchelfHook
, binutils-unwrapped
, gnutar
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
unzip
];
buildInputs = [
- alsaLib
+ alsa-lib
libav_0_8
libnotify
libresample
diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix
index dfb110795f4c..38d3d6304c68 100644
--- a/pkgs/applications/video/droidcam/default.nix
+++ b/pkgs/applications/video/droidcam/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
-, ffmpeg, libjpeg_turbo, gtk3, alsaLib, speex, libusbmuxd, libappindicator-gtk3
+, ffmpeg, libjpeg_turbo, gtk3, alsa-lib, speex, libusbmuxd, libappindicator-gtk3
, pkg-config
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
ffmpeg
libjpeg_turbo
gtk3
- alsaLib
+ alsa-lib
speex
libusbmuxd
libappindicator-gtk3
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index ba35c24ecf57..c31eb244c52c 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -6,7 +6,7 @@
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless
, gtest, ncurses, spdlog
, libxml2, systemd
-, alsaLib, libGLU, libGL, fontconfig, freetype, ftgl
+, alsa-lib, libGLU, libGL, fontconfig, freetype, ftgl
, libjpeg, libpng, libtiff
, libmpeg2, libsamplerate, libmad
, libogg, libvorbis, flac, libxslt
@@ -114,7 +114,7 @@ in stdenv.mkDerivation {
gettext pcre-cpp yajl fribidi libva libdrm
openssl gperf tinyxml2 taglib libssh
gtest ncurses spdlog
- alsaLib libGL libGLU fontconfig freetype ftgl
+ alsa-lib libGL libGLU fontconfig freetype ftgl
libjpeg libpng libtiff
libmpeg2 libsamplerate libmad
libogg libvorbis flac libxslt systemd
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index 81b5be75f3bc..352af7754c7e 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU
-, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsaLib, udev, libjack2
+, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid , alsa-lib, udev, libjack2
}:
let
fullPath = lib.makeLibraryPath [
@@ -17,7 +17,7 @@ let
zlib
openssl
libuuid
- alsaLib
+ alsa-lib
libjack2
udev
];
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index b6bfa9d0dcf2..bdcd3fbc8fd3 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -5,7 +5,7 @@
, x11Support ? true, libX11 ? null, libXext ? null, libGLU, libGL ? null
, xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null
-, alsaSupport ? stdenv.isLinux, alsaLib ? null
+, alsaSupport ? stdenv.isLinux, alsa-lib ? null
, screenSaverSupport ? true, libXScrnSaver ? null
, vdpauSupport ? false, libvdpau ? null
, cddaSupport ? !stdenv.isDarwin, cdparanoia ? null
@@ -36,7 +36,7 @@ assert fribidiSupport -> (fribidi != null);
assert x11Support -> (libX11 != null && libXext != null && libGLU != null && libGL != null);
assert xineramaSupport -> (libXinerama != null && x11Support);
assert xvSupport -> (libXv != null && x11Support);
-assert alsaSupport -> alsaLib != null;
+assert alsaSupport -> alsa-lib != null;
assert screenSaverSupport -> libXScrnSaver != null;
assert vdpauSupport -> libvdpau != null;
assert cddaSupport -> cdparanoia != null;
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
++ optional fontconfigSupport fontconfig
++ optional fribidiSupport fribidi
++ optionals x11Support [ libX11 libXext libGLU libGL ]
- ++ optional alsaSupport alsaLib
+ ++ optional alsaSupport alsa-lib
++ optional xvSupport libXv
++ optional theoraSupport libtheora
++ optional cacaSupport libcaca
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 99cb08a02a0b..3bde15430579 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -30,7 +30,7 @@
, libdrm ? null
, mesa ? null
-, alsaSupport ? stdenv.isLinux, alsaLib ? null
+, alsaSupport ? stdenv.isLinux, alsa-lib ? null
, archiveSupport ? true, libarchive ? null
, bluraySupport ? true, libbluray ? null
, bs2bSupport ? true, libbs2b ? null
@@ -61,7 +61,7 @@ with lib;
let
available = x: x != null;
in
-assert alsaSupport -> available alsaLib;
+assert alsaSupport -> available alsa-lib;
assert archiveSupport -> available libarchive;
assert bluraySupport -> available libbluray;
assert bs2bSupport -> available libbs2b;
@@ -159,7 +159,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
ffmpeg freetype libass libpthreadstubs
luaEnv libuchardet mujs
- ] ++ optional alsaSupport alsaLib
+ ] ++ optional alsaSupport alsa-lib
++ optional archiveSupport libarchive
++ optional bluraySupport libbluray
++ optional bs2bSupport libbs2b
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 236aec2ee563..cf307f0da34e 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -1,5 +1,5 @@
{ lib, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper
-, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype
+, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsa-lib, freetype
, perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders
}:
@@ -24,7 +24,7 @@ mkDerivation rec {
buildInputs = [
freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL
- perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC
+ perl libsamplerate libbluray lzo alsa-lib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC
libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2
];
nativeBuildInputs = [ pkg-config which yasm libtool autoconf automake file ];
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 109744969c23..a50fe16660fb 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -30,7 +30,7 @@
, python3
, alsaSupport ? stdenv.isLinux
-, alsaLib
+, alsa-lib
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux
, libpulseaudio
, libcef
@@ -77,7 +77,7 @@ in mkDerivation rec {
mbedtls
]
++ optionals scriptingSupport [ luajit swig python3 ]
- ++ optional alsaSupport alsaLib
+ ++ optional alsaSupport alsa-lib
++ optional pulseaudioSupport libpulseaudio
++ optional pipewireSupport pipewire;
diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
index 84f5ac56e7db..c3bcc09cd3fb 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, doxygen
-, alsaLib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor
+, alsa-lib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor
, zlib, AGL, Cocoa, Foundation
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
[ pkg-config cmake doxygen ];
buildInputs =
- optionals stdenv.isLinux [ alsaLib ]
+ optionals stdenv.isLinux [ alsa-lib ]
++ (if stdenv.isDarwin then
[ zlib AGL Cocoa Foundation ]
else
diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix
index ecedd730094c..0e0580b9f2ae 100644
--- a/pkgs/applications/video/qmplay2/default.nix
+++ b/pkgs/applications/video/qmplay2/default.nix
@@ -2,7 +2,7 @@
, fetchFromGitHub
, pkg-config
, cmake
-, alsaLib
+, alsa-lib
, ffmpeg
, libass
, libcddb
@@ -36,7 +36,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [
- alsaLib
+ alsa-lib
ffmpeg
libass
libcddb
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 14575a88dc17..34842b38743b 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, alsaLib, ffmpeg, libjack2, libX11, libXext, libXinerama, qtx11extras
+{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg, libjack2, libX11, libXext, libXinerama, qtx11extras
, libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja
}:
@@ -27,7 +27,7 @@ mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ninja ];
buildInputs = [
- alsaLib ffmpeg libjack2 libX11 libXext libXfixes libXinerama libGLU libGL
+ alsa-lib ffmpeg libjack2 libX11 libXext libXfixes libXinerama libGLU libGL
libpulseaudio libv4l qtbase qttools qtx11extras
];
diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
index 4d90e6327b93..32a35eca9200 100644
--- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix
+++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
@@ -7,7 +7,7 @@
, wrapGAppsHook
, at-spi2-core
, atk
-, alsaLib
+, alsa-lib
, cairo
, cups
, dbus
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = with xorg; [
at-spi2-core
atk
- alsaLib
+ alsa-lib
autoPatchelfHook
cairo
cups.lib
diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix
index 395de891eb93..cb2338c0e185 100644
--- a/pkgs/applications/video/vdr/plugins.nix
+++ b/pkgs/applications/video/vdr/plugins.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchgit, vdr, alsaLib, fetchFromGitHub
+{ lib, stdenv, fetchurl, fetchgit, vdr, alsa-lib, fetchFromGitHub
, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg_3
, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses
, callPackage
@@ -54,7 +54,7 @@ in {
buildInputs = [
vdr libxcb xcbutilwm ffmpeg_3
- alsaLib
+ alsa-lib
libvdpau # vdpau
libva # va-api
] ++ (with xorg; [ libxcb libX11 ]);
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index adb7ba970e29..ed5976151301 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, autoreconfHook
, libarchive, perl, xorg, libdvdnav, libbluray
-, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
+, zlib, a52dec, libmad, faad2, ffmpeg, alsa-lib
, pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska
, libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp
, libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
# which are not included here for no other reason that nobody has mentioned
# needing them
buildInputs = [
- zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
+ zlib a52dec libmad faad2 ffmpeg alsa-lib libdvdnav libdvdnav.libdvdread
libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
systemd gnutls avahi libcddb SDL SDL_image libmtp taglib libarchive
diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix
index 598a162f3998..aeea52a4ff5a 100644
--- a/pkgs/applications/video/vokoscreen/default.nix
+++ b/pkgs/applications/video/vokoscreen/default.nix
@@ -1,5 +1,5 @@
{ lib, fetchFromGitHub, mkDerivation
-, pkg-config, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr
+, pkg-config, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsa-lib, libv4l, libXrandr
, ffmpeg
}:
@@ -17,7 +17,7 @@ mkDerivation rec {
nativeBuildInputs = [ pkg-config qmake ];
buildInputs = [
- alsaLib
+ alsa-lib
libv4l
qtbase
qtmultimedia
diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix
index aea8266b1d0c..63f1e885af30 100644
--- a/pkgs/applications/video/webcamoid/default.nix
+++ b/pkgs/applications/video/webcamoid/default.nix
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, qmake
, qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2
-, ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2
+, ffmpeg-full, gst_all_1, libpulseaudio, alsa-lib, jack2
, v4l-utils }:
mkDerivation rec {
pname = "webcamoid";
@@ -18,7 +18,7 @@ mkDerivation rec {
qtbase qtdeclarative qtquickcontrols qtquickcontrols2
ffmpeg-full
gst_all_1.gstreamer gst_all_1.gst-plugins-base
- alsaLib libpulseaudio jack2
+ alsa-lib libpulseaudio jack2
v4l-utils
];
diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix
index 7660edcc7683..3b486654aeb9 100644
--- a/pkgs/applications/video/webtorrent_desktop/default.nix
+++ b/pkgs/applications/video/webtorrent_desktop/default.nix
@@ -1,5 +1,5 @@
{
- alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype,
+ alsa-lib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype,
gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor,
libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst,
libxcb, nspr, nss, lib, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core
@@ -7,7 +7,7 @@
let
rpath = lib.makeLibraryPath ([
- alsaLib
+ alsa-lib
atk
at-spi2-core
at-spi2-atk
diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix
index f197abacee04..5a6c6ff524e3 100644
--- a/pkgs/applications/video/wxcam/default.nix
+++ b/pkgs/applications/video/wxcam/default.nix
@@ -7,7 +7,7 @@
, perlPackages
, xvidcore
, mjpegtools
-, alsaLib
+, alsa-lib
, libv4l
, cimg }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
};
buildInputs = with lib;
- [ pkg-config intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsaLib libv4l cimg ];
+ [ pkg-config intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsa-lib libv4l cimg ];
NIX_CFLAGS_COMPILE="-I ${cimg}/include/cimg";
diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix
index 0945c5b3f3fd..b046fbebaa26 100644
--- a/pkgs/applications/video/xawtv/default.nix
+++ b/pkgs/applications/video/xawtv/default.nix
@@ -4,7 +4,7 @@
, libjpeg
, libX11
, libXt
-, alsaLib
+, alsa-lib
, aalib
, libXft
, xorgproto
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
xorgproto
libFS
perl
- alsaLib
+ alsa-lib
aalib
libXaw
libXpm
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 0a9de4eb10a7..7fd01a8ffa95 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib
-, perl, pixman, vde2, alsaLib, texinfo, flex
+, perl, pixman, vde2, alsa-lib, texinfo, flex
, bison, lzo, snappy, libaio, gnutls, nettle, curl, ninja, meson
, makeWrapper, autoPatchelfHook
, attr, libcap, libcap_ng
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
++ optionals smartcardSupport [ libcacard ]
++ optionals spiceSupport [ spice-protocol spice ]
++ optionals usbredirSupport [ usbredir ]
- ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
+ ++ optionals stdenv.isLinux [ alsa-lib libaio libcap_ng libcap attr ]
++ optionals xenSupport [ xen ]
++ optionals cephSupport [ ceph ]
++ optionals glusterfsSupport [ glusterfs libuuid ]
diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix
index 2abb16298d4e..2b27e3a7875a 100644
--- a/pkgs/applications/virtualization/spice-vdagent/default.nix
+++ b/pkgs/applications/virtualization/spice-vdagent/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, pkg-config, alsaLib, spice-protocol, glib,
+{lib, stdenv, fetchurl, pkg-config, alsa-lib, spice-protocol, glib,
libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm,
systemd}:
stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
substituteInPlace data/spice-vdagent.desktop --replace /usr $out
'';
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsaLib spice-protocol glib libdrm
+ buildInputs = [ alsa-lib spice-protocol glib libdrm
libpciaccess libxcb libXrandr libXinerama libXfixes
dbus systemd ] ;
meta = {
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 4f792b4eb6e4..0bc3af364e6d 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -2,7 +2,7 @@
, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
-, alsaLib, curl, libvpx, nettools, dbus, substituteAll
+, alsa-lib, curl, libvpx, nettools, dbus, substituteAll
# If open-watcom-bin is not passed, VirtualBox will fall back to use
# the shipped alternative sources (assembly).
, open-watcom-bin ? null
@@ -53,7 +53,7 @@ in stdenv.mkDerivation {
buildInputs =
[ iasl' dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL
- libcap glib lvm2 alsaLib curl libvpx pam makeself perl
+ libcap glib lvm2 alsa-lib curl libvpx pam makeself perl
libXmu libpng libopus python ]
++ optional javaBindings jdk
++ optional pythonBindings python # Python is needed even when not building bindings
@@ -82,7 +82,7 @@ in stdenv.mkDerivation {
s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g'
grep 'libasound\.so\.2' src include -rI --files-with-match | xargs sed -i -e '
- s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g'
+ s@"libasound\.so\.2"@"${alsa-lib.out}/lib/libasound.so.2"@g'
export USER=nix
set +x
diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix
index 765baa0a3b4d..cb91d8505633 100644
--- a/pkgs/applications/virtualization/xen/4.10.nix
+++ b/pkgs/applications/virtualization/xen/4.10.nix
@@ -10,7 +10,7 @@
# qemu
, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir
-, alsaLib, glib, python2
+, alsa-lib, glib, python2
, ... } @ args:
assert withInternalSeabios -> !withSeabios;
@@ -33,7 +33,7 @@ let
qemuDeps = [
udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
- alsaLib glib python2
+ alsa-lib glib python2
];
in
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index ba284b76867d..7b22eb399251 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -1,9 +1,9 @@
{ lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkg-config, xorg
-, enableAlsaUtils ? true, alsaUtils, coreutils
+, enableAlsaUtils ? true, alsa-utils, coreutils
, enableNetwork ? true, dnsutils, iproute2, wirelesstools }:
let
- bins = lib.optionals enableAlsaUtils [ alsaUtils coreutils ]
+ bins = lib.optionals enableAlsaUtils [ alsa-utils coreutils ]
++ lib.optionals enableNetwork [ dnsutils iproute2 wirelesstools ];
in
diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix
index df774aa417f3..4acc2fb669c6 100644
--- a/pkgs/applications/window-managers/i3/blocks-gaps.nix
+++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix
@@ -1,5 +1,5 @@
{ fetchFromGitHub, lib, stdenv, perl, makeWrapper
-, iproute2, acpi, sysstat, alsaUtils
+, iproute2, acpi, sysstat, alsa-utils
, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface"
"load_average" "memory" "volume" "wifi" ]
}:
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/libexec/i3blocks/iface \
--prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute2)}
wrapProgram $out/libexec/i3blocks/volume \
- --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)}
+ --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsa-utils)}
'';
meta = with lib; {
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index 935a6c3c23b4..8e9cb2d2b76f 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, libconfuse, yajl, alsaLib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
+{ fetchurl, lib, stdenv, libconfuse, yajl, alsa-lib, libpulseaudio, libnl, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
stdenv.mkDerivation rec {
name = "i3status-2.13";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ];
- buildInputs = [ libconfuse yajl alsaLib libpulseaudio libnl ];
+ buildInputs = [ libconfuse yajl alsa-lib libpulseaudio libnl ];
makeFlags = [ "all" "PREFIX=$(out)" ];
diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix
index cc99e79fca8d..bd9bcb30d107 100644
--- a/pkgs/applications/window-managers/wayfire/wf-shell.nix
+++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git
-, alsaLib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config
+, alsa-lib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config
}:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wayland ];
buildInputs = [
- alsaLib gtkmm3 gtk-layer-shell pulseaudio wayfire wf-config
+ alsa-lib gtkmm3 gtk-layer-shell pulseaudio wayfire wf-config
];
mesonFlags = [ "--sysconfdir" "/etc" ];
diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix
index 43080f2eae7d..e22b02825b75 100644
--- a/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix
+++ b/pkgs/applications/window-managers/windowmaker/dockapps/AlsaMixer-app.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsaLib }:
+{ lib, stdenv, dockapps-sources, pkg-config, libX11, libXpm, libXext, alsa-lib }:
stdenv.mkDerivation rec {
pname = "AlsaMixer.app";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = dockapps-sources;
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ libX11 libXpm libXext alsaLib ];
+ buildInputs = [ libX11 libXpm libXext alsa-lib ];
setSourceRoot = ''
export sourceRoot=$(echo */${pname})
diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix
index ec15f7e36275..f9b5d227b0e8 100644
--- a/pkgs/applications/window-managers/yabar/build.nix
+++ b/pkgs/applications/window-managers/yabar/build.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkg-config
-, xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl
+, xcbutilwm, alsa-lib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl
, configFile ? null, lib
, rev, sha256, version, patches ? []
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
cairo gdk-pixbuf libconfig pango xcbutilwm docbook_xsl
- alsaLib wirelesstools asciidoc libxslt makeWrapper
+ alsa-lib wirelesstools asciidoc libxslt makeWrapper
];
postPatch = ''
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 3a820853b1fb..6ba5890885d6 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -171,7 +171,7 @@ rec {
librsvg
xorg.libXft
libvdpau
- alsaLib
+ alsa-lib
harfbuzz
e2fsprogs
diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix
index a68886d414bc..7e716ddb5c13 100644
--- a/pkgs/desktops/enlightenment/efl/default.nix
+++ b/pkgs/desktops/enlightenment/efl/default.nix
@@ -4,7 +4,7 @@
, ninja
, pkg-config
, SDL2
-, alsaLib
+, alsa-lib
, bullet
, check
, curl
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
SDL2
- alsaLib
+ alsa-lib
bullet
curl
dbus
diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix
index 3b750bd08b75..84cadd209499 100644
--- a/pkgs/desktops/enlightenment/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/enlightenment/default.nix
@@ -4,7 +4,7 @@
, ninja
, pkg-config
, gettext
-, alsaLib
+, alsa-lib
, acpid
, bc
, ddcutil
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
acpid # for systems with ACPI for lid events, AC/Battery plug in/out etc
bc # for the Everything module calculator mode
ddcutil # specifically libddcutil.so.2 for backlight control
diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix
index e091cf2365af..4a1b7f4c20c7 100644
--- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix
@@ -14,7 +14,7 @@
, libgnomekbd
, lcms2
, libpulseaudio
-, alsaLib
+, alsa-lib
, libcanberra-gtk3
, upower
, colord
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
gnome-desktop
lcms2
libpulseaudio
- alsaLib
+ alsa-lib
libcanberra-gtk3
upower
colord
diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix
index 15a3d918b95a..548f89389599 100644
--- a/pkgs/desktops/lxde/core/lxpanel/default.nix
+++ b/pkgs/desktops/lxde/core/lxpanel/default.nix
@@ -20,7 +20,7 @@
, lxmenu-data
, wirelesstools
, curl
-, supportAlsa ? false, alsaLib
+, supportAlsa ? false, alsa-lib
}:
stdenv.mkDerivation rec {
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
m4
wirelesstools
curl
- ] ++ lib.optional supportAlsa alsaLib;
+ ] ++ lib.optional supportAlsa alsa-lib;
postPatch = ''
substituteInPlace src/Makefile.in \
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index c565c5b4c301..34578e6bc5fe 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, cmake
, pkg-config
-, alsaLib
+, alsa-lib
, kguiaddons
, kwindowsystem
, libXdamage
@@ -46,7 +46,7 @@ mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
kguiaddons
kwindowsystem
libXdamage
diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix
index 9d42c23c7148..4fe73fadbc4a 100644
--- a/pkgs/desktops/mate/libmatemixer/default.nix
+++ b/pkgs/desktops/mate/libmatemixer/default.nix
@@ -1,5 +1,5 @@
{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib
-, alsaSupport ? stdenv.isLinux, alsaLib
+, alsaSupport ? stdenv.isLinux, alsa-lib
, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
, ossSupport ? false
, mateUpdateScript
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config gettext ];
buildInputs = [ glib ]
- ++ lib.optional alsaSupport alsaLib
+ ++ lib.optional alsaSupport alsa-lib
++ lib.optional pulseaudioSupport libpulseaudio;
configureFlags = lib.optional ossSupport "--enable-oss";
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index 43fd7a69e8ad..568414aab35c 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -15,7 +15,7 @@
, libgnomekbd
, lcms2
, libpulseaudio
-, alsaLib
+, alsa-lib
, libcanberra-gtk3
, upower
, colord
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
buildInputs = [
accountsservice
- alsaLib
+ alsa-lib
colord
gcr
geoclue2
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index e304f67bd754..f61d925036c0 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -7,7 +7,7 @@
, makeWrapper
, setJavaClassPath
# minimum dependencies
-, alsaLib
+, alsa-lib
, fontconfig
, freetype
, libffi
@@ -44,7 +44,7 @@ let result = stdenv.mkDerivation rec {
};
buildInputs = [
- alsaLib # libasound.so wanted by lib/libjsound.so
+ alsa-lib # libasound.so wanted by lib/libjsound.so
fontconfig
freetype
stdenv.cc.cc.lib # libstdc++.so.6
diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix
index 747de25142e5..c8a1964814e5 100644
--- a/pkgs/development/compilers/cudatoolkit/common.nix
+++ b/pkgs/development/compilers/cudatoolkit/common.nix
@@ -6,7 +6,7 @@ args@
, developerProgram ? false
, runPatches ? []
, addOpenGLRunpath
-, alsaLib
+, alsa-lib
, expat
, fetchurl
, fontconfig
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
runtimeDependencies = [
ncurses5 expat python27 zlib glibc
xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
- gtk2 glib fontconfig freetype unixODBC alsaLib
+ gtk2 glib fontconfig freetype unixODBC alsa-lib
];
rpath = "${lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64";
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index 27436d8b6143..5cab3b929f75 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -14,7 +14,7 @@
, stdenv
, lib
, fetchurl
-, alsaLib
+, alsa-lib
, dbus
, expat
, libpulseaudio
@@ -107,7 +107,7 @@ let
libGLU
# for android emulator
- alsaLib
+ alsa-lib
dbus
expat
libpulseaudio
diff --git a/pkgs/development/compilers/graalvm/community-edition.nix b/pkgs/development/compilers/graalvm/community-edition.nix
index 3a8fca2c1a05..0d12d5fe2dfb 100644
--- a/pkgs/development/compilers/graalvm/community-edition.nix
+++ b/pkgs/development/compilers/graalvm/community-edition.nix
@@ -6,7 +6,7 @@
, makeWrapper
# minimum dependencies
, Foundation
-, alsaLib
+, alsa-lib
, fontconfig
, freetype
, glibc
@@ -82,7 +82,7 @@ let
];
buildInputs = lib.optionals stdenv.isLinux [
- alsaLib # libasound.so wanted by lib/libjsound.so
+ alsa-lib # libasound.so wanted by lib/libjsound.so
fontconfig
freetype
openssl # libssl.so wanted by languages/ruby/lib/mri/openssl.so
diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix
index eb3045d52ad6..f3ca8a4f5bbb 100644
--- a/pkgs/development/compilers/graalvm/enterprise-edition.nix
+++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, setJavaClassPath }:
+{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsa-lib, setJavaClassPath }:
let
common = javaVersion:
@@ -125,7 +125,7 @@ let
}.${javaVersion}
}:${
lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender
- glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}"
+ glib zlib bzip2 alsa-lib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}"
for f in $(find $out -type f -perm -0100); do
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 15238e63ecbd..ef593422ff26 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
+, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
, setJavaClassPath
@@ -27,7 +27,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix
index 33169be53026..66aeff306e38 100644
--- a/pkgs/development/compilers/openjdk/12.nix
+++ b/pkgs/development/compilers/openjdk/12.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
+, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk11, fetchpatch
, setJavaClassPath
@@ -24,7 +24,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk11
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix
index d3db493c5fe7..96a567895d6a 100644
--- a/pkgs/development/compilers/openjdk/13.nix
+++ b/pkgs/development/compilers/openjdk/13.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
+, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch
, setJavaClassPath
@@ -24,7 +24,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix
index 3804999376ed..fae27b8ca754 100644
--- a/pkgs/development/compilers/openjdk/14.nix
+++ b/pkgs/development/compilers/openjdk/14.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
+, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap
, setJavaClassPath
@@ -24,7 +24,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix
index 6430c9709362..11333b1ef66a 100644
--- a/pkgs/development/compilers/openjdk/15.nix
+++ b/pkgs/development/compilers/openjdk/15.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
+, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk15-bootstrap
, setJavaClassPath
@@ -24,7 +24,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip zip file which ];
buildInputs = [
- cpio perl zlib cups freetype alsaLib libjpeg giflib
+ cpio perl zlib cups freetype alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix
index 9a710ed6fa46..99033e8738c5 100644
--- a/pkgs/development/compilers/openjdk/16.nix
+++ b/pkgs/development/compilers/openjdk/16.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
-, file, which, unzip, zip, perl, cups, freetype, alsaLib, libjpeg, giflib
+, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib
, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap
, setJavaClassPath
@@ -28,7 +28,7 @@ let
nativeBuildInputs = [ pkg-config autoconf unzip ];
buildInputs = [
- cpio file which zip perl zlib cups freetype alsaLib libjpeg giflib
+ cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig openjdk16-bootstrap
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 423c09d923a3..7a69038d5e0a 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, pkg-config, lndir, bash, cpio, file, which, unzip, zip
-, cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib
+, cups, freetype, alsa-lib, cacert, perl, liberation_ttf, fontconfig, zlib
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
, libjpeg, giflib
, openjdk8-bootstrap
@@ -85,7 +85,7 @@ let
nativeBuildInputs = [ pkg-config lndir unzip ];
buildInputs = [
- cpio file which zip perl openjdk8-bootstrap zlib cups freetype alsaLib
+ cpio file which zip perl openjdk8-bootstrap zlib cups freetype alsa-lib
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
libXi libXinerama libXcursor libXrandr fontconfig
] ++ lib.optionals (!headless && enableGnome2) [
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix
index 306130a0991c..228dbf9b14e9 100644
--- a/pkgs/development/compilers/openjdk/openjfx/11.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake
-, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby
+, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python, ruby
, openjdk11-bootstrap }:
let
@@ -19,7 +19,7 @@ let
sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194";
};
- buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];
+ buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ];
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ];
dontUseCmakeConfigure = true;
diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix
index e5da2bc3fe05..c36cbaa03f95 100644
--- a/pkgs/development/compilers/openjdk/openjfx/15.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/15.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen
-, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
+, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib
, ffmpeg, python3, ruby }:
let
@@ -21,7 +21,7 @@ let
sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1";
};
- buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];
+ buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ];
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];
dontUseCmakeConfigure = true;
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index ca8f4106f3db..713b32a349b4 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -26,7 +26,7 @@
, gtk2
, pango
, cairo
-, alsaLib
+, alsa-lib
, atk
, gdk-pixbuf
, setJavaClassPath
@@ -168,7 +168,7 @@ let result = stdenv.mkDerivation rec {
* libXt is only needed on amd64
*/
libraries =
- [stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
+ [stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsa-lib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc];
rpath = lib.strings.makeLibraryPath libraries;
diff --git a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix
index eafe23c8e76d..a232b796a068 100644
--- a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix
@@ -3,7 +3,7 @@
, xorg
, zlib
, freetype
-, alsaLib
+, alsa-lib
, setJavaClassPath
}:
@@ -30,7 +30,7 @@ let result = stdenv.mkDerivation rec {
'';
postFixup = ''
- rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}"
+ rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsa-lib]}"
for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
diff --git a/pkgs/development/compilers/oraclejdk/jdk14-linux.nix b/pkgs/development/compilers/oraclejdk/jdk14-linux.nix
index b1655cd8b8fe..6604ebbef82d 100644
--- a/pkgs/development/compilers/oraclejdk/jdk14-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk14-linux.nix
@@ -3,7 +3,7 @@
, xorg
, zlib
, freetype
-, alsaLib
+, alsa-lib
, setJavaClassPath
}:
@@ -30,7 +30,7 @@ let result = stdenv.mkDerivation rec {
'';
postFixup = ''
- rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsaLib]}"
+ rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsa-lib]}"
for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix
index 591f10b3be9d..6fcdacf535b8 100644
--- a/pkgs/development/compilers/zulu/8.nix
+++ b/pkgs/development/compilers/zulu/8.nix
@@ -7,7 +7,7 @@
, setJavaClassPath
, zulu
# minimum dependencies
-, alsaLib
+, alsa-lib
, fontconfig
, freetype
, xorg
@@ -49,7 +49,7 @@ in stdenv.mkDerivation {
};
buildInputs = lib.optionals stdenv.isLinux [
- alsaLib # libasound.so wanted by lib/libjsound.so
+ alsa-lib # libasound.so wanted by lib/libjsound.so
fontconfig
freetype
stdenv.cc.cc # libstdc++.so.6
diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index cd1181877488..81edb8b469a8 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -7,7 +7,7 @@
, setJavaClassPath
, zulu
# minimum dependencies
-, alsaLib
+, alsa-lib
, fontconfig
, freetype
, zlib
@@ -50,7 +50,7 @@ in stdenv.mkDerivation {
};
buildInputs = lib.optionals stdenv.isLinux [
- alsaLib # libasound.so wanted by lib/libjsound.so
+ alsa-lib # libasound.so wanted by lib/libjsound.so
fontconfig
freetype
stdenv.cc.cc # libstdc++.so.6
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 459821f253f5..2d65d3355cc7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -15890,7 +15890,7 @@ self: {
}) {};
"PortMidi" = callPackage
- ({ mkDerivation, alsaLib, base }:
+ ({ mkDerivation, alsa-lib, base }:
mkDerivation {
pname = "PortMidi";
version = "0.2.0.0";
@@ -15898,13 +15898,13 @@ self: {
revision = "1";
editedCabalFile = "0h3gql271mdz3kh0jgimxv8ada34b0h4n8wnyf5i759fqxpf6w86";
libraryHaskellDepends = [ base ];
- librarySystemDepends = [ alsaLib ];
+ librarySystemDepends = [ alsa-lib ];
description = "A binding for PortMedia/PortMidi";
license = lib.licenses.bsd3;
platforms = [
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
];
- }) {inherit (pkgs) alsaLib;};
+ }) {inherit (pkgs) alsa-lib;};
"PortMidi-simple" = callPackage
({ mkDerivation, base, PortMidi }:
@@ -17168,7 +17168,7 @@ self: {
}) {};
"RtMidi" = callPackage
- ({ mkDerivation, alsaLib, base, deepseq, pretty-simple, tasty
+ ({ mkDerivation, alsa-lib, base, deepseq, pretty-simple, tasty
, tasty-hunit, unliftio-core, vector
}:
mkDerivation {
@@ -17178,14 +17178,14 @@ self: {
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base deepseq unliftio-core vector ];
- librarySystemDepends = [ alsaLib ];
+ librarySystemDepends = [ alsa-lib ];
executableHaskellDepends = [ base pretty-simple vector ];
testHaskellDepends = [ base tasty tasty-hunit vector ];
description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library";
license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {inherit (pkgs) alsaLib;};
+ }) {inherit (pkgs) alsa-lib;};
"RxHaskell" = callPackage
({ mkDerivation, base, containers, stm, transformers }:
@@ -26730,7 +26730,7 @@ self: {
}) {};
"alsa" = callPackage
- ({ mkDerivation, alsaLib, array, base, extensible-exceptions
+ ({ mkDerivation, alsa-lib, array, base, extensible-exceptions
, sample-frame
}:
mkDerivation {
@@ -26740,27 +26740,27 @@ self: {
libraryHaskellDepends = [
array base extensible-exceptions sample-frame
];
- librarySystemDepends = [ alsaLib ];
+ librarySystemDepends = [ alsa-lib ];
description = "Binding to the ALSA Library API";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {inherit (pkgs) alsaLib;};
+ }) {inherit (pkgs) alsa-lib;};
"alsa-core" = callPackage
- ({ mkDerivation, alsaLib, base, extensible-exceptions }:
+ ({ mkDerivation, alsa-lib, base, extensible-exceptions }:
mkDerivation {
pname = "alsa-core";
version = "0.5.0.1";
sha256 = "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b";
libraryHaskellDepends = [ base extensible-exceptions ];
- libraryPkgconfigDepends = [ alsaLib ];
+ libraryPkgconfigDepends = [ alsa-lib ];
description = "Binding to the ALSA Library API (Exceptions)";
license = lib.licenses.bsd3;
platforms = [
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
];
- }) {inherit (pkgs) alsaLib;};
+ }) {inherit (pkgs) alsa-lib;};
"alsa-gui" = callPackage
({ mkDerivation, alsa-core, alsa-seq, base, midi, midi-alsa, wx
@@ -26781,7 +26781,7 @@ self: {
}) {};
"alsa-midi" = callPackage
- ({ mkDerivation, alsaLib, array, base, event-list, midi
+ ({ mkDerivation, alsa-lib, array, base, event-list, midi
, non-negative
}:
mkDerivation {
@@ -26794,32 +26794,32 @@ self: {
libraryHaskellDepends = [
array base event-list midi non-negative
];
- librarySystemDepends = [ alsaLib ];
- executableSystemDepends = [ alsaLib ];
+ librarySystemDepends = [ alsa-lib ];
+ executableSystemDepends = [ alsa-lib ];
description = "Bindings for the ALSA sequencer API (MIDI stuff)";
license = "GPL";
hydraPlatforms = lib.platforms.none;
broken = true;
- }) {inherit (pkgs) alsaLib;};
+ }) {inherit (pkgs) alsa-lib;};
"alsa-mixer" = callPackage
- ({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }:
+ ({ mkDerivation, alsa-core, alsa-lib, base, c2hs, unix }:
mkDerivation {
pname = "alsa-mixer";
version = "0.3.0";
sha256 = "00ny2p3276jilidjs44npc8zmbhynz3f2lpmlwwl6swwx5yijsnb";
libraryHaskellDepends = [ alsa-core base unix ];
- librarySystemDepends = [ alsaLib ];
+ librarySystemDepends = [ alsa-lib ];
libraryToolDepends = [ c2hs ];
description = "Bindings to the ALSA simple mixer API";
license = lib.licenses.bsd3;
platforms = [
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
];
- }) {inherit (pkgs) alsaLib;};
+ }) {inherit (pkgs) alsa-lib;};
"alsa-pcm" = callPackage
- ({ mkDerivation, alsa-core, alsaLib, array, base
+ ({ mkDerivation, alsa-core, alsa-lib, array, base
, extensible-exceptions, sample-frame, semigroups, storable-record
}:
mkDerivation {
@@ -26832,13 +26832,13 @@ self: {
alsa-core array base extensible-exceptions sample-frame semigroups
storable-record
];
- libraryPkgconfigDepends = [ alsaLib ];
+ libraryPkgconfigDepends = [ alsa-lib ];
description = "Binding to the ALSA Library API (PCM audio)";
license = lib.licenses.bsd3;
platforms = [
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
];
- }) {inherit (pkgs) alsaLib;};
+ }) {inherit (pkgs) alsa-lib;};
"alsa-pcm-tests" = callPackage
({ mkDerivation, alsa, base }:
@@ -26855,7 +26855,7 @@ self: {
}) {};
"alsa-seq" = callPackage
- ({ mkDerivation, alsa-core, alsaLib, array, base, bytestring
+ ({ mkDerivation, alsa-core, alsa-lib, array, base, bytestring
, data-accessor, enumset, extensible-exceptions, poll, transformers
, utility-ht
}:
@@ -26869,13 +26869,13 @@ self: {
alsa-core array base bytestring data-accessor enumset
extensible-exceptions poll transformers utility-ht
];
- libraryPkgconfigDepends = [ alsaLib ];
+ libraryPkgconfigDepends = [ alsa-lib ];
description = "Binding to the ALSA Library API (MIDI sequencer)";
license = lib.licenses.bsd3;
platforms = [
"aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux"
];
- }) {inherit (pkgs) alsaLib;};
+ }) {inherit (pkgs) alsa-lib;};
"alsa-seq-tests" = callPackage
({ mkDerivation, alsa, base }:
diff --git a/pkgs/development/interpreters/python/conda/default.nix b/pkgs/development/interpreters/python/conda/default.nix
index 5249ccce0d9a..77bda13f266c 100644
--- a/pkgs/development/interpreters/python/conda/default.nix
+++ b/pkgs/development/interpreters/python/conda/default.nix
@@ -4,7 +4,7 @@
# When installing a conda binary package, just extend
# the `buildInputs` with `condaAutopatchLibs`.
condaPatchelfLibs = builtins.map (p: p.lib or p) ([
- pkgs.alsaLib
+ pkgs.alsa-lib
pkgs.cups
pkgs.gcc-unwrapped
pkgs.libGL
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index b7efc37ae044..fc8d8f1652de 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, alsaLib
+{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, alsa-lib
, libjack2, libsndfile, fftw, curl, gcc
, libXt, qtbase, qttools, qtwebengine
, readline, qtwebsockets, useSCEL ? false, emacs
@@ -27,7 +27,7 @@ mkDerivation rec {
buildInputs = [
gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ]
- ++ optional (!stdenv.isDarwin) alsaLib
+ ++ optional (!stdenv.isDarwin) alsa-lib
++ optional useSCEL emacs;
meta = with lib; {
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index b51bc3f7cdd8..bf76bc1e8570 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, config, fetchurl, fetchpatch, pkg-config, audiofile, libcap, libiconv
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, openglSupport ? libGLSupported, libGL, libGLU
-, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
+, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib
, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
, libXext, libICE, libXrandr
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio
@@ -17,7 +17,7 @@ let
extraPropagatedBuildInputs = [ ]
++ optionals x11Support [ libXext libICE libXrandr ]
++ optionals openglSupport [ libGL libGLU ]
- ++ optional alsaSupport alsaLib
+ ++ optional alsaSupport alsa-lib
++ optional pulseaudioSupport libpulseaudio
++ optional stdenv.isDarwin Cocoa;
rpath = makeLibraryPath extraPropagatedBuildInputs;
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
# Please try revert the change that introduced this comment when updating SDL.
] ++ optional stdenv.isDarwin "--disable-x11-shared"
++ optional (!x11Support) "--without-x"
- ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib";
+ ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib";
patches = [
./find-headers.patch
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index f70a46e2f8ed..d02dac1f562f 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, config, fetchurl, pkg-config
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, openglSupport ? libGLSupported, libGL
-, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
+, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib
, x11Support ? !stdenv.targetPlatform.isWindows && !stdenv.hostPlatform.isAndroid
, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor
, libXinerama, libXext, libXxf86vm, libXrandr
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
++ optionals x11Support [ libX11 xorgproto ];
dlopenBuildInputs = [ ]
- ++ optionals alsaSupport [ alsaLib audiofile ]
+ ++ optionals alsaSupport [ alsa-lib audiofile ]
++ optional dbusSupport dbus
++ optional pulseaudioSupport libpulseaudio
++ optional udevSupport udev
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--disable-oss"
] ++ optional (!x11Support) "--without-x"
- ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"
+ ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"
++ optional stdenv.targetPlatform.isWindows "--disable-video-opengles"
++ optional stdenv.isDarwin "--disable-sdltest";
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 314347411261..5cd6584f18fe 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11
-, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
+, libXpm, libXt, libXcursor, alsa-lib, cmake, zlib, libpng, libvorbis
, libXxf86dga, libXxf86misc
, libXxf86vm, openal, libGLU, libGL, libjpeg, flac
, libXi, libXfixes, freetype, libopus, libtheora
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [
texinfo libXext xorgproto libX11 libXpm libXt libXcursor
- alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
+ alsa-lib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
libXxf86vm openal libGLU libGL
libjpeg flac
libXi libXfixes
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 9fefbe01ace0..6abf632806a4 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, texinfo6_5, libXext, xorgproto, libX11
-, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
+, libXpm, libXt, libXcursor, alsa-lib, cmake, zlib, libpng, libvorbis
, libXxf86dga, libXxf86misc
, libXxf86vm, openal, libGLU, libGL }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [
texinfo6_5 libXext xorgproto libX11 libXpm libXt libXcursor
- alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
+ alsa-lib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
libXxf86vm openal libGLU libGL
];
diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index 5693a5968b67..e3bc04a6d226 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -21,13 +21,13 @@ let
in stdenv.mkDerivation rec {
pname = "amdvlk";
- version = "2021.Q2.2";
+ version = "2021.Q2.4";
src = fetchRepoProject {
name = "${pname}-src";
manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
rev = "refs/tags/v-${version}";
- sha256 = "4k9ZkBxJGuNUO44F9D+u54eUREl5/8zxjxhaShhzGv0=";
+ sha256 = "KPWkwbD55BoztF6DPmvau9i1AMhR+5ad5VrrD8I2YyI=";
};
buildInputs = [
diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index b1c6c6396c86..e1f2d326879c 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
+{ lib, stdenv, fetchurl, alsa-lib, fftw, libjack2, libsamplerate
, libsndfile, pkg-config, python3, wafHook
}:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config python3 wafHook ];
- buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ];
+ buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ];
strictDeps = true;
diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix
index 03048abcc321..4f2f78f20cf0 100644
--- a/pkgs/development/libraries/audio/rtaudio/default.nix
+++ b/pkgs/development/libraries/audio/rtaudio/default.nix
@@ -6,7 +6,7 @@
, cmake
, pkg-config
, alsaSupport ? stdenv.hostPlatform.isLinux
-, alsaLib
+, alsa-lib
, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux
, libpulseaudio
, jackSupport ? true
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = lib.optional alsaSupport alsaLib
+ buildInputs = lib.optional alsaSupport alsa-lib
++ lib.optional pulseaudioSupport libpulseaudio
++ lib.optional jackSupport jack
++ lib.optional coreaudioSupport CoreAudio;
diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix
index ccfafd36a8a3..6c75b9866e89 100644
--- a/pkgs/development/libraries/audio/rtmidi/default.nix
+++ b/pkgs/development/libraries/audio/rtmidi/default.nix
@@ -5,7 +5,7 @@
, cmake
, pkg-config
, alsaSupport ? stdenv.hostPlatform.isLinux
-, alsaLib
+, alsa-lib
, jackSupport ? true
, jack
, coremidiSupport ? stdenv.hostPlatform.isDarwin
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = lib.optional alsaSupport alsaLib
+ buildInputs = lib.optional alsaSupport alsa-lib
++ lib.optional jackSupport jack
++ lib.optionals coremidiSupport [ CoreMIDI CoreAudio CoreServices ];
diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
index 45f5fcfe3a44..afecd561b727 100644
--- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
+++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl , alsaLib, }:
+{ lib, stdenv, fetchurl , alsa-lib, }:
stdenv.mkDerivation rec {
pname = "zita-alsa-pcmi";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s";
};
- buildInputs = [ alsaLib ];
+ buildInputs = [ alsa-lib ];
buildPhase = ''
cd source
diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index 88b1840955d3..54df6d7b2550 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, alsaLib, AudioUnit, CoreServices }:
+{ stdenv, lib, fetchurl, fetchpatch, alsa-lib, AudioUnit, CoreServices }:
let
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs =
lib.optionals stdenv.isLinux [
- alsaLib
+ alsa-lib
] ++ lib.optionals stdenv.isDarwin [
CoreServices AudioUnit
];
diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/development/libraries/clanlib/default.nix
index 15fd9cd7286d..0a0f976e0dc4 100644
--- a/pkgs/development/libraries/clanlib/default.nix
+++ b/pkgs/development/libraries/clanlib/default.nix
@@ -10,7 +10,7 @@
, freetype
, fontconfig
, xlibsWrapper
-, alsaLib
+, alsa-lib
, libXrender
}:
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
freetype
fontconfig
xlibsWrapper
- alsaLib
+ alsa-lib
libXrender
];
diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index fb0d6afc7105..ba3768227f32 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl
, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, graphviz-nox, pkg-config, qttools, wrapQtAppsHook
-, alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio
+, alsa-lib, fluidsynth, qtbase, qtsvg, libpulseaudio
}:
stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib fluidsynth libpulseaudio qtbase qtsvg
+ alsa-lib fluidsynth libpulseaudio qtbase qtsvg
];
cmakeFlags = [
diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix
index 9ce487b1b03a..ca7ea10afffa 100644
--- a/pkgs/development/libraries/dssi/default.nix
+++ b/pkgs/development/libraries/dssi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM
+{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsa-lib, qt4, libX11, libsndfile, libSM
, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkg-config
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
- [ ladspaH libjack2 liblo alsaLib qt4 libX11 libsndfile libSM
+ [ ladspaH libjack2 liblo alsa-lib qt4 libX11 libsndfile libSM
libsamplerate libtool autoconf automake xorgproto libICE pkg-config
];
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index dcd1388143da..98d8ef434e06 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -47,7 +47,7 @@
/*
* External libraries options
*/
-, alsaLib ? null # Alsa in/output support
+, alsa-lib ? null # Alsa in/output support
#, avisynth ? null # Support for reading AviSynth scripts
, bzip2 ? null
, celt ? null # CELT decoder
@@ -433,7 +433,7 @@ stdenv.mkDerivation rec {
++ optionals nonfreeLicensing [ fdk_aac openssl ]
++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf
- ++ optionals isLinux [ alsaLib libraw1394 libv4l vulkan-loader glslang ]
+ ++ optionals isLinux [ alsa-lib libraw1394 libv4l vulkan-loader glslang ]
++ optional (isLinux && !isAarch64 && libmfx != null) libmfx
++ optional nvenc nv-codec-headers
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 7e4a6a080987..d52abd4ab09f 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm
-, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
+, alsa-lib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
, libssh, libtheora, libva, libdrm, libvorbis, libvpx, xz, libpulseaudio, soxr
, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d
, openglSupport ? false, libGLU ? null, libGL ? null
@@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM
++ optional ((isLinux || isFreeBSD) && !isAarch32) libva
++ optional ((isLinux || isFreeBSD) && !isAarch32) libdrm
- ++ optional isLinux alsaLib
+ ++ optional isLinux alsa-lib
++ optionals isDarwin darwinFrameworks
++ optional vdpauSupport libvdpau
++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL)
diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix
index a80c317b06ee..cd8eb538462b 100644
--- a/pkgs/development/libraries/flite/default.nix
+++ b/pkgs/development/libraries/flite/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, alsaLib, fetchpatch }:
+{ lib, stdenv, fetchFromGitHub, alsa-lib, fetchpatch }:
stdenv.mkDerivation rec {
pname = "flite";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf";
};
- buildInputs = lib.optionals stdenv.isLinux [ alsaLib ];
+ buildInputs = lib.optionals stdenv.isLinux [ alsa-lib ];
# https://github.com/festvox/flite/pull/60.
# Replaces `ar` with `$(AR)` in config/common_make_rules.
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 7e9095ef0ede..699f70a0788a 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -26,7 +26,7 @@
, wayland
, wayland-protocols
, enableAlsa ? stdenv.isLinux
-, alsaLib
+, alsa-lib
# Enabling Cocoa seems to currently not work, giving compile
# errors. Suspected is that a newer version than clang
# is needed than 5.0 but it is not clear.
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
pango
OpenGL
] ++ lib.optionals enableAlsa [
- alsaLib
+ alsa-lib
] ++ lib.optionals enableX11 [
libXext
libXv
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 99d38f0cfc43..4a07ba9da7d8 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, libpulseaudio, alsaLib, libcap
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, libpulseaudio, alsa-lib, libcap
, CoreAudio, CoreServices, AudioUnit
, usePulseAudio }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ] ++
lib.optional usePulseAudio libpulseaudio ++
- lib.optionals stdenv.isLinux [ alsaLib libcap ] ++
+ lib.optionals stdenv.isLinux [ alsa-lib libcap ] ++
lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 0127c1ebe8a1..5d4bca0f1b9f 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -2,7 +2,7 @@
, gtk ? null
, libpulseaudio, gst_all_1, libvorbis, libcap
, CoreServices
-, withAlsa ? stdenv.isLinux, alsaLib }:
+, withAlsa ? stdenv.isLinux, alsa-lib }:
stdenv.mkDerivation rec {
name = "libcanberra-0.30";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
] ++ (with gst_all_1; [ gstreamer gst-plugins-base ])
++ lib.optional stdenv.isDarwin CoreServices
++ lib.optional stdenv.isLinux libcap
- ++ lib.optional withAlsa alsaLib;
+ ++ lib.optional withAlsa alsa-lib;
configureFlags = [ "--disable-oss" ];
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index ec1a5ee38281..8f01958a9bcf 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
+{ lib, stdenv, fetchurl, cmake, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig
, GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor
, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver
, libXtst, nspr, nss, pango, libpulseaudio, systemd, at-spi2-atk, at-spi2-core
@@ -7,7 +7,7 @@
let
libPath =
lib.makeLibraryPath [
- alsaLib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2
+ alsa-lib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2
libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi
libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio
systemd at-spi2-core at-spi2-atk
diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index a734a4b80092..02ccf0c66fb5 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, texinfo, alsaLib, libpulseaudio, CoreAudio }:
+{ lib, stdenv, fetchurl, texinfo, alsa-lib, libpulseaudio, CoreAudio }:
let
inherit (lib) optional optionalString;
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
};
buildInputs = [ texinfo ]
- ++ optional stdenv.isLinux alsaLib
+ ++ optional stdenv.isLinux alsa-lib
++ optional stdenv.isDarwin CoreAudio;
propagatedBuildInputs =
optional stdenv.isLinux libpulseaudio;
diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix
index fc577d7e5082..e9a54dc478cd 100644
--- a/pkgs/development/libraries/libqtav/default.nix
+++ b/pkgs/development/libraries/libqtav/default.nix
@@ -2,7 +2,7 @@
, qtbase, qtmultimedia, qtquick1, qttools
, libGL, libX11
, libass, openal, ffmpeg, libuchardet
-, alsaLib, libpulseaudio, libva
+, alsa-lib, libpulseaudio, libva
}:
with lib;
@@ -16,7 +16,7 @@ mkDerivation rec {
qtbase qtmultimedia qtquick1
libGL libX11
libass openal ffmpeg libuchardet
- alsaLib libpulseaudio libva
+ alsa-lib libpulseaudio libva
];
src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix
index ac9f3b256546..2ef629e5467b 100644
--- a/pkgs/development/libraries/libsoundio/default.nix
+++ b/pkgs/development/libraries/libsoundio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }:
+{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, libjack2, libpulseaudio, AudioUnit }:
stdenv.mkDerivation rec {
version = "2.0.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libjack2 libpulseaudio ]
- ++ lib.optional stdenv.isLinux alsaLib
+ ++ lib.optional stdenv.isLinux alsa-lib
++ lib.optional stdenv.isDarwin AudioUnit;
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-strict-prototypes";
diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix
index 004460abe312..d9be4a2964f4 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libspotify, alsaLib, readline, pkg-config, apiKey ? null, unzip, gnused }:
+{ lib, stdenv, fetchurl, libspotify, alsa-lib, readline, pkg-config, apiKey ? null, unzip, gnused }:
let
version = "12.1.51";
@@ -67,7 +67,7 @@ else stdenv.mkDerivation {
src = libspotify.src;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libspotify readline ]
- ++ lib.optional (!stdenv.isDarwin) alsaLib;
+ ++ lib.optional (!stdenv.isDarwin) alsa-lib;
postUnpack = "sourceRoot=$sourceRoot/share/doc/libspotify/examples";
patchPhase = "cp ${apiKey} appkey.c";
installPhase = ''
diff --git a/pkgs/development/libraries/libtgvoip/default.nix b/pkgs/development/libraries/libtgvoip/default.nix
index 920315bb1bc2..dcf8990a879e 100644
--- a/pkgs/development/libraries/libtgvoip/default.nix
+++ b/pkgs/development/libraries/libtgvoip/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, pkg-config, autoreconfHook
-, openssl, libopus, alsaLib, libpulseaudio
+, openssl, libopus, alsa-lib, libpulseaudio
}:
with lib;
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
- buildInputs = [ openssl libopus alsaLib libpulseaudio ];
+ buildInputs = [ openssl libopus alsa-lib libpulseaudio ];
enableParallelBuilding = true;
meta = {
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index 6b7f0c102ee8..b93cc96bde02 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, help2man, python3,
- alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }:
+ alsa-lib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }:
stdenv.mkDerivation rec {
name = "lirc-0.10.1";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config help2man
(python3.withPackages (p: with p; [ pyyaml setuptools ])) ];
- buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ];
+ buildInputs = [ alsa-lib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ];
configureFlags = [
"--sysconfdir=/etc"
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 452031dc9246..5d9cc98b1a9c 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -1,4 +1,4 @@
-{ alsaLib
+{ alsa-lib
, bctoolbox
, bzrtp
, cmake
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
];
propagatedBuildInputs = [
- alsaLib
+ alsa-lib
bctoolbox
bzrtp
ffmpeg
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index 43c781cf52ce..2d469a406dec 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, cmake
-, alsaSupport ? !stdenv.isDarwin, alsaLib ? null
+, alsaSupport ? !stdenv.isDarwin, alsa-lib ? null
, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null
, CoreServices, AudioUnit, AudioToolbox
}:
with lib;
-assert alsaSupport -> alsaLib != null;
+assert alsaSupport -> alsa-lib != null;
assert pulseSupport -> libpulseaudio != null;
stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = []
- ++ optional alsaSupport alsaLib
+ ++ optional alsaSupport alsa-lib
++ optional pulseSupport libpulseaudio
++ optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];
diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix
index ebdacdfc9bdb..2c7dd440da82 100644
--- a/pkgs/development/libraries/pcaudiolib/default.nix
+++ b/pkgs/development/libraries/pcaudiolib/default.nix
@@ -1,6 +1,6 @@
{ config, stdenv, lib, fetchFromGitHub
, autoconf, automake, which, libtool, pkg-config
-, portaudio, alsaLib
+, portaudio, alsa-lib
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake which libtool pkg-config ];
buildInputs = [ portaudio ]
- ++ lib.optionals stdenv.isLinux [ alsaLib ]
+ ++ lib.optionals stdenv.isLinux [ alsa-lib ]
++ lib.optionals pulseaudioSupport [ libpulseaudio ];
preConfigure = "./autogen.sh";
diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix
index 1e686b980043..276ad6b8c492 100644
--- a/pkgs/development/libraries/pipewire/0.2.nix
+++ b/pkgs/development/libraries/pipewire/0.2.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, doxygen, graphviz, valgrind
-, glib, dbus, gst_all_1, alsaLib, ffmpeg_4, libjack2, udev, libva, xorg
+, glib, dbus, gst_all_1, alsa-lib, ffmpeg_4, libjack2, udev, libva, xorg
, sbc, SDL2, makeFontsConf
}:
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer
- alsaLib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2
+ alsa-lib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2
];
mesonFlags = [
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index b3e740f39c46..40f4e328c317 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -11,7 +11,7 @@
, valgrind
, glib
, dbus
-, alsaLib
+, alsa-lib
, libjack2
, udev
, libva
@@ -85,7 +85,7 @@ let
];
buildInputs = [
- alsaLib
+ alsa-lib
dbus
glib
libjack2
diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index c7de116e879b..efa68146e8d8 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, pkg-config, libjack2
+{ lib, stdenv, fetchurl, alsa-lib, pkg-config, libjack2
, AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }:
stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libjack2 ]
- ++ lib.optional (!stdenv.isDarwin) alsaLib;
+ ++ lib.optional (!stdenv.isDarwin) alsa-lib;
configureFlags = [ "--disable-mac-universal" "--enable-cxx" ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
make install
'' + lib.optionalString (!stdenv.isDarwin) ''
# fixup .pc file to find alsa library
- sed -i "s|-lasound|-L${alsaLib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc
+ sed -i "s|-lasound|-L${alsa-lib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc
'' + lib.optionalString stdenv.isDarwin ''
cp include/pa_mac_core.h $out/include/pa_mac_core.h
'';
diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix
index e9a868240bb3..0151d461c139 100644
--- a/pkgs/development/libraries/portmidi/default.nix
+++ b/pkgs/development/libraries/portmidi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsaLib }:
+{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsa-lib }:
stdenv.mkDerivation rec {
pname = "portmidi";
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ unzip cmake ];
- buildInputs = [ alsaLib ];
+ buildInputs = [ alsa-lib ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 532a72c820ce..ed93d86a1979 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -3,7 +3,7 @@
, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
, libmng, which, libGLU, openssl, dbus, cups, pkg-config
, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi
-, alsaLib
+, alsa-lib
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2, gdk-pixbuf
, gnomeStyle ? false, libgnomeui, GConf, gnome_vfs
diff --git a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
index 0af773947f04..0d2d565fe7ae 100644
--- a/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtmultimedia.nix
@@ -1,5 +1,5 @@
{ qtModule, lib, stdenv, qtbase, qtdeclarative, pkg-config
-, alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland
+, alsa-lib, gstreamer, gst-plugins-base, libpulseaudio, wayland
}:
with lib;
@@ -9,7 +9,7 @@ qtModule {
qtInputs = [ qtbase qtdeclarative ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gstreamer gst-plugins-base libpulseaudio ]
- ++ optional (stdenv.isLinux) alsaLib
+ ++ optional (stdenv.isLinux) alsa-lib
++ optional (versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland;
outputs = [ "bin" "dev" "out" ];
qmakeFlags = [ "GST_VERSION=1.0" ];
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 13ab7e35c5a4..729c5f388f99 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -8,7 +8,7 @@
, fontconfig, freetype, harfbuzz, icu, dbus, libdrm
, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus
, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent
-, alsaLib
+, alsa-lib
, libcap
, pciutils
, systemd
@@ -156,7 +156,7 @@ qtModule {
dbus zlib minizip snappy nss protobuf jsoncpp
# Audio formats
- alsaLib
+ alsa-lib
# Text rendering
fontconfig freetype
diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix
index 16f6c324a7a9..836bafd4280f 100644
--- a/pkgs/development/libraries/raylib/default.nix
+++ b/pkgs/development/libraries/raylib/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake,
mesa, libGLU, glfw,
libX11, libXi, libXcursor, libXrandr, libXinerama,
- alsaSupport ? stdenv.hostPlatform.isLinux, alsaLib,
+ alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib,
pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio,
sharedLib ? true,
includeEverything ? true
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [
mesa libGLU glfw libX11 libXi libXcursor libXrandr libXinerama
- ] ++ lib.optional alsaSupport alsaLib
+ ] ++ lib.optional alsaSupport alsa-lib
++ lib.optional pulseSupport libpulseaudio;
# https://github.com/raysan5/raylib/wiki/CMake-Build-Options
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
# fix libasound.so/libpulse.so not being found
preFixup = ''
- ${lib.optionalString alsaSupport "patchelf --add-needed ${alsaLib}/lib/libasound.so $out/lib/libraylib.so.${version}"}
+ ${lib.optionalString alsaSupport "patchelf --add-needed ${alsa-lib}/lib/libasound.so $out/lib/libraylib.so.${version}"}
${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${version}"}
'';
diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix
index 4948e481ff58..41d776c68698 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/pkgs/development/libraries/snack/default.nix
@@ -1,4 +1,4 @@
-# alsaLib vorbis-tools python can be made optional
+# alsa-lib vorbis-tools python can be made optional
{ lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }:
diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix
index c54b4a3721f6..8706b8789227 100644
--- a/pkgs/development/libraries/speech-tools/default.nix
+++ b/pkgs/development/libraries/speech-tools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, ncurses }:
+{ lib, stdenv, fetchurl, alsa-lib, ncurses }:
stdenv.mkDerivation rec {
name = "speech_tools-${version}.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4";
};
- buildInputs = [ alsaLib ncurses ];
+ buildInputs = [ alsa-lib ncurses ];
preConfigure = ''
sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . )
diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix
index 0f16a519169f..80034a5a9cf0 100644
--- a/pkgs/development/libraries/speechd/default.nix
+++ b/pkgs/development/libraries/speechd/default.nix
@@ -15,7 +15,7 @@
, libsndfile
, withLibao ? true, libao
, withPulse ? false, libpulseaudio
-, withAlsa ? false, alsaLib
+, withAlsa ? false, alsa-lib
, withOss ? false
, withFlite ? true, flite
# , withFestival ? false, festival-freebsoft-utils
@@ -77,7 +77,7 @@ in stdenv.mkDerivation rec {
libsndfile
libao
libpulseaudio
- alsaLib
+ alsa-lib
python
] ++ optionals withEspeak [
espeak
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index 584b1e15a8e3..ff1f5eb8041a 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -4,7 +4,7 @@
, ninja
, pkg-config
, pixman
-, alsaLib
+, alsa-lib
, openssl
, libXrandr
, libXfixes
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
cyrus_sasl
glib
gst_all_1.gst-plugins-base
diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix
index 880823a84732..81c1b51e6589 100644
--- a/pkgs/development/libraries/wildmidi/default.nix
+++ b/pkgs/development/libraries/wildmidi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, cmake, alsaLib, freepats }:
+{ lib, stdenv, fetchurl, cmake, alsa-lib, freepats }:
stdenv.mkDerivation rec {
name = "wildmidi-0.4.3";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- buildInputs = [ alsaLib stdenv.cc.libc/*couldn't find libm*/ ];
+ buildInputs = [ alsa-lib stdenv.cc.libc/*couldn't find libm*/ ];
preConfigure = ''
substituteInPlace CMakeLists.txt \
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 8915299a7349..70fdf24dd9f4 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -2,7 +2,7 @@
, stdenv
, fetchurl
, aalib
-, alsaLib
+, alsa-lib
, ffmpeg
, flac
, libGL
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
aalib
- alsaLib
+ alsa-lib
ffmpeg
flac
libGL
diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix
index c8fce166aa7d..2746a60247bf 100644
--- a/pkgs/development/mobile/androidenv/emulator.nix
+++ b/pkgs/development/mobile/androidenv/emulator.nix
@@ -26,7 +26,7 @@ deployAndroidPackage {
pkgs.freetype
pkgs.nss
pkgs.nspr
- pkgs.alsaLib
+ pkgs.alsa-lib
];
patchInstructions = lib.optionalString (os == "linux") ''
addAutoPatchelfSearchPath $packageBaseDir/lib
diff --git a/pkgs/development/octave-modules/audio/default.nix b/pkgs/development/octave-modules/audio/default.nix
index 4fafefd6f75d..0cb03746085a 100644
--- a/pkgs/development/octave-modules/audio/default.nix
+++ b/pkgs/development/octave-modules/audio/default.nix
@@ -2,7 +2,7 @@
, lib
, fetchurl
, jack2
-, alsaLib
+, alsa-lib
, rtmidi
, pkg-config
}:
@@ -22,7 +22,7 @@ buildOctavePackage rec {
propagatedBuildInputs = [
jack2
- alsaLib
+ alsa-lib
rtmidi
];
@@ -31,6 +31,6 @@ buildOctavePackage rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ KarlJoad ];
description = "Audio and MIDI Toolbox for GNU Octave";
- platforms = platforms.linux; # Because of run-time dependency on jack2 and alsaLib
+ platforms = platforms.linux; # Because of run-time dependency on jack2 and alsa-lib
};
}
diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix
index c00c92a6c333..88ef9f9efde8 100644
--- a/pkgs/development/pharo/vm/build-vm-legacy.nix
+++ b/pkgs/development/pharo/vm/build-vm-legacy.nix
@@ -10,7 +10,7 @@
, libGL
, freetype
, xorg
-, alsaLib
+, alsa-lib
, cairo
, libuuid
, libnsl
@@ -30,10 +30,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ unzip cmake gcc makeWrapper ];
buildInputs = [ bash glibc openssl libGLU libGL freetype
- xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libnsl ];
+ xorg.libX11 xorg.libICE xorg.libSM alsa-lib cairo pharo-share libnsl ];
LD_LIBRARY_PATH = lib.makeLibraryPath
- [ cairo libGLU libGL freetype openssl libuuid alsaLib
+ [ cairo libGLU libGL freetype openssl libuuid alsa-lib
xorg.libICE xorg.libSM ];
preConfigure = ''
diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index c1f703f72515..498e5c414727 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -8,7 +8,7 @@
, libGLU, libGL
, freetype
, xorg
-, alsaLib
+, alsa-lib
, cairo
, libuuid
, autoreconfHook
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
xorg.libX11
xorg.libICE
xorg.libSM
- alsaLib
+ alsa-lib
cairo
pharo-share
libuuid
@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
freetype
openssl
libuuid
- alsaLib
+ alsa-lib
xorg.libICE
xorg.libSM
];
diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix
index a8e3236a3a03..a51366820a9d 100644
--- a/pkgs/development/pharo/vm/vms.nix
+++ b/pkgs/development/pharo/vm/vms.nix
@@ -11,7 +11,7 @@
, libGLU, libGL
, freetype
, xorg
-, alsaLib
+, alsa-lib
, cairo
, libuuid
, autoreconfHook
diff --git a/pkgs/development/python-modules/ansible/legacy.nix b/pkgs/development/python-modules/ansible/legacy.nix
index 2779feffee87..174ab6dc6c46 100644
--- a/pkgs/development/python-modules/ansible/legacy.nix
+++ b/pkgs/development/python-modules/ansible/legacy.nix
@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "ansible";
- version = "2.9.21";
+ version = "2.9.22";
src = fetchFromGitHub {
owner = "ansible";
repo = "ansible";
rev = "v${version}";
- sha256 = "1pfiwq2wfw11vmxdq2yhk86hm5jljlrnphlzfjr01kwzfikkdp5m";
+ sha256 = "0gkv59cfxzs0ahgkxmmx9sqnfb2xqr10q4yh2662nbzajmvqmfgm";
};
prePatch = ''
diff --git a/pkgs/development/python-modules/notify-py/default.nix b/pkgs/development/python-modules/notify-py/default.nix
index ea9f0485bef8..ba4725c9aaa4 100644
--- a/pkgs/development/python-modules/notify-py/default.nix
+++ b/pkgs/development/python-modules/notify-py/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, coreutils, alsaUtils
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, coreutils, alsa-utils
, libnotify, which, jeepney, loguru, pytestCheckHook }:
buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
};
propagatedNativeBuildInputs = [ which ]
- ++ lib.optionals stdenv.isLinux [ alsaUtils libnotify ];
+ ++ lib.optionals stdenv.isLinux [ alsa-utils libnotify ];
propagatedBuildInputs = [ loguru ]
++ lib.optionals stdenv.isLinux [ jeepney ];
diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix
index a249b0aede13..e9cff7eb8243 100644
--- a/pkgs/development/python-modules/py-desmume/default.nix
+++ b/pkgs/development/python-modules/py-desmume/default.nix
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, GitPython
, libpcap, meson, ninja, pillow, pkg-config, pygobject3, SDL2
-, alsaLib, soundtouch, openal
+, alsa-lib, soundtouch, openal
}:
let
@@ -26,7 +26,7 @@ buildPythonPackage rec {
cp -R --no-preserve=mode ${desmume} __build_desmume
'';
- buildInputs = [ GitPython libpcap SDL2 alsaLib soundtouch openal ];
+ buildInputs = [ GitPython libpcap SDL2 alsa-lib soundtouch openal ];
nativeBuildInputs = [ meson ninja pkg-config ];
propagatedBuildInputs = [ pillow pygobject3 ];
diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix
index 9967394d28e0..b41b7ddf320c 100644
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/pkgs/development/python-modules/py3status/default.nix
@@ -14,7 +14,7 @@
, file
, acpi
, coreutils
-, alsaUtils
+, alsa-utils
, i3
, procps
, lm_sensors
@@ -40,7 +40,7 @@ buildPythonPackage rec {
sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py
sed -i -e "s|notify-send|${libnotify}/bin/notify-send|" py3status/modules/battery_level.py
sed -i -e "s|/usr/bin/whoami|${coreutils}/bin/whoami|" py3status/modules/external_script.py
- sed -i -e "s|'amixer|'${alsaUtils}/bin/amixer|" py3status/modules/volume_status.py
+ sed -i -e "s|'amixer|'${alsa-utils}/bin/amixer|" py3status/modules/volume_status.py
sed -i -e "s|'i3-nagbar|'${i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py
sed -i -e "s|'free|'${procps}/bin/free|" py3status/modules/sysdata.py
sed -i -e "s|'sensors|'${lm_sensors}/bin/sensors|" py3status/modules/sysdata.py
diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix
index aadf75d59f7f..781231749fdf 100644
--- a/pkgs/development/python-modules/python-rtmidi/default.nix
+++ b/pkgs/development/python-modules/python-rtmidi/default.nix
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
-, pkg-config, alsaLib, libjack2, tox, flake8, alabaster
+, pkg-config, alsa-lib, libjack2, tox, flake8, alabaster
}:
buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsaLib libjack2 ];
+ buildInputs = [ alsa-lib libjack2 ];
checkInputs = [
tox
flake8
diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix
index 4e6da0b8d422..e1565fa6c30c 100644
--- a/pkgs/development/python-modules/rtmidi-python/default.nix
+++ b/pkgs/development/python-modules/rtmidi-python/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, cython, alsaLib }:
+{ lib, buildPythonPackage, fetchPypi, cython, alsa-lib }:
buildPythonPackage rec {
pname = "rtmidi-python";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
'';
nativeBuildInputs = [ cython ];
- buildInputs = [ alsaLib ];
+ buildInputs = [ alsa-lib ];
setupPyBuildFlags = [ "--from-cython" ];
diff --git a/pkgs/development/python-modules/simpleaudio/default.nix b/pkgs/development/python-modules/simpleaudio/default.nix
index 948716a9b7cb..4ab18efe332a 100644
--- a/pkgs/development/python-modules/simpleaudio/default.nix
+++ b/pkgs/development/python-modules/simpleaudio/default.nix
@@ -1,4 +1,4 @@
-{ alsaLib, buildPythonPackage, fetchFromGitHub, isPy27, lib }:
+{ alsa-lib, buildPythonPackage, fetchFromGitHub, isPy27, lib }:
buildPythonPackage rec {
pname = "simpleaudio";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
sha256 = "12nypzb1m14yip4zrbzin5jc5awyp1d5md5y40g5anj4phb4hx1i";
};
- buildInputs = [ alsaLib ];
+ buildInputs = [ alsa-lib ];
meta = with lib; {
homepage = "https://github.com/hamiltron/py-simple-audio";
diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix
index 568ce67d1434..838ffd471840 100644
--- a/pkgs/development/python-modules/sipsimple/default.nix
+++ b/pkgs/development/python-modules/sipsimple/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
'';
nativeBuildInputs = [ pkgs.pkg-config ];
- buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ];
+ buildInputs = with pkgs; [ alsa-lib ffmpeg_3 libv4l sqlite libvpx ];
propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ];
meta = with lib; {
diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index d256b6e767a6..25d61d2393e5 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -3,7 +3,7 @@
, zlib
, xorg
, freetype
-, alsaLib
+, alsa-lib
, jdk11
, curl
, lttng-ust
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
xorg.libXtst
xorg.libXrender
freetype
- alsaLib
+ alsa-lib
jdk11
stdenv.cc.cc.lib
curl
diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 3a210ab174f9..5e457227c8da 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, scons, pkg-config, udev, libX11
, libXcursor , libXinerama, libXrandr, libXrender, libpulseaudio
, libXi, libXext, libXfixes, freetype, openssl
-, alsaLib, libGLU, zlib, yasm
+, alsa-lib, libGLU, zlib, yasm
, withUdev ? true
}:
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
scons udev libX11 libXcursor libXinerama libXrandr libXrender
- libXi libXext libXfixes freetype openssl alsaLib libpulseaudio
+ libXi libXext libXfixes freetype openssl alsa-lib libpulseaudio
libGLU zlib yasm
];
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
index 475c08eb169f..f5276510e612 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, buildEnv, makeWrapper
-, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig
+, xorg, alsa-lib, dbus, glib, gtk2, atk, pango, freetype, fontconfig
, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
, libnotify}:
let
@@ -10,7 +10,7 @@ let
name = "nwjs-env";
paths = [
xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk-pixbuf
- freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
+ freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage
xorg.libXext xorg.libXfixes nss nspr gconf expat dbus
xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap
libnotify
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index 9cfb3c448e84..7d0175ac912a 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, buildEnv, makeWrapper
-, xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig
+, xorg, alsa-lib, dbus, glib, gtk3, atk, pango, freetype, fontconfig
, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
, libnotify
, ffmpeg, libxcb, cups
@@ -16,7 +16,7 @@ let
name = "nwjs-env";
paths = [
xorg.libX11 xorg.libXrender glib /*gtk2*/ gtk3 atk pango cairo gdk-pixbuf
- freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
+ freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage
xorg.libXext xorg.libXfixes nss nspr gconf expat dbus
xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr
xorg.libXScrnSaver cups
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index ca8359a32a8c..1db72dc1c8ff 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome, atk, at-spi2-atk, at-spi2-core
-, gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem
+, gtk3, glib, freetype, dbus, nss, nspr, alsa-lib, cups, expat, udev, makeDesktopItem
}:
let
@@ -16,7 +16,7 @@ let
dbus
nss
nspr
- alsaLib
+ alsa-lib
cups
expat
udev
diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix
index fcb1edf153ac..cc46f3f5d340 100644
--- a/pkgs/development/tools/thrust/default.nix
+++ b/pkgs/development/tools/thrust/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk2, atk
+{ lib, stdenv, fetchurl, buildEnv, makeWrapper, glib, alsa-lib , dbus, gtk2, atk
, pango, freetype, fontconfig, gdk-pixbuf , cairo, cups, expat, nspr, gconf, nss
, xorg, libcap, unzip
}:
@@ -8,7 +8,7 @@ let
name = "env-thrust";
paths = [
stdenv.cc.cc glib dbus gtk2 atk pango freetype fontconfig gdk-pixbuf
- cairo cups expat alsaLib nspr gconf nss xorg.libXrender xorg.libX11
+ cairo cups expat alsa-lib nspr gconf nss xorg.libXrender xorg.libX11
xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite
xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap
];
diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index 5c41a1dac931..9333864c69b9 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeWrapper, file, getopt
, gtk2, gtk3, gdk-pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb
-, alsaLib, GConf, cups, libcap, fontconfig, freetype, pango
+, alsa-lib, GConf, cups, libcap, fontconfig, freetype, pango
, cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
, libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
, libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb, chromium
@@ -10,7 +10,7 @@
let
libPath64 = lib.makeLibraryPath [
gcc.cc gtk2 gdk-pixbuf glib libGL libGLU nss nspr
- alsaLib GConf cups libcap fontconfig freetype pango
+ alsa-lib GConf cups libcap fontconfig freetype pango
cairo dbus expat zlib libpng12 udev tbb
libX11 libXcursor libXdamage libXfixes libXrender libXi
libXcomposite libXext libXrandr libXtst libSM libICE libxcb
diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix
index dc2f80221172..19cd15e7be41 100644
--- a/pkgs/development/tools/unityhub/default.nix
+++ b/pkgs/development/tools/unityhub/default.nix
@@ -6,7 +6,7 @@ in appimageTools.wrapType2 rec {
name = "unityhub";
extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk_pixbuf glib libGL libGLU nss nspr
- alsaLib cups gnome2.GConf libcap fontconfig freetype pango
+ alsa-lib cups gnome2.GConf libcap fontconfig freetype pango
cairo dbus dbus-glib libdbusmenu libdbusmenu-gtk2 expat zlib libpng12 udev tbb
libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5
diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index 287709bbbad7..9563563bc427 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook, mesa }:
+{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsa-lib, udev, unzip, wrapGAppsHook, mesa }:
stdenv.mkDerivation rec {
pname = "cypress";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = with xorg; [
libXScrnSaver libXdamage libXtst libxshmfence
] ++ [
- nss gtk2 alsaLib gnome2.GConf gtk3
+ nss gtk2 alsa-lib gnome2.GConf gtk3
mesa # for libgbm
];
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index 1c854368df73..3ba900f3f691 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, makeWrapper, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat
+{ lib, stdenv, makeWrapper, fetchurl, dpkg, alsa-lib, atk, cairo, cups, dbus, expat
, fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, mesa, nspr, nss, gtk3, gtk2
, at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
[ autoPatchelfHook dpkg makeWrapper gobject-introspection wrapGAppsHook ];
buildInputs = [
- alsaLib
+ alsa-lib
at-spi2-atk
atk
cairo
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index b8763c943234..6eb7eb1b58c5 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, makeDesktopItem, wrapGAppsHook
-, atk, at-spi2-atk, at-spi2-core, alsaLib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3
+, atk, at-spi2-atk, at-spi2-core, alsa-lib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3
, freetype, fontconfig, nss, nspr, pango, udev, libuuid, libX11, libxcb, libXi
, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes
, libXrender, libXtst, libXScrnSaver, libdrm, mesa
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
atk
at-spi2-atk
at-spi2-core
- alsaLib
+ alsa-lib
cairo
cups
dbus
diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix
index dc4f1f47f7b1..b40a608412ef 100644
--- a/pkgs/games/adom/default.nix
+++ b/pkgs/games/adom/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU, libGL, alsaLib, libpulseaudio
+{ lib, stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU, libGL, alsa-lib, libpulseaudio
, xorg }:
let
@@ -6,7 +6,7 @@ let
inherit (xorg) libXext libX11;
lpath = "${stdenv.cc.cc.lib}/lib64:" + lib.makeLibraryPath [
- zlib libmad libpng12 libcaca libXext libX11 libGLU libGL alsaLib libpulseaudio];
+ zlib libmad libpng12 libcaca libXext libX11 libGLU libGL alsa-lib libpulseaudio];
in
stdenv.mkDerivation rec {
diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix
index d648ac85c60e..61f5a5bf824d 100644
--- a/pkgs/games/amoeba/default.nix
+++ b/pkgs/games/amoeba/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkg-config }:
+{ lib, stdenv, fetchurl, amoeba-data, alsa-lib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkg-config }:
stdenv.mkDerivation rec {
name = "amoeba-${version}-${debver}";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU xorg.libXxf86vm ];
+ buildInputs = [ alsa-lib expat freetype gtk2 libvorbis libGLU xorg.libXxf86vm ];
installPhase = ''
mkdir -p $out/bin $out/share/man/man1/
diff --git a/pkgs/games/clonehero/default.nix b/pkgs/games/clonehero/default.nix
index 377e1d79bdac..cf1fad8d945b 100644
--- a/pkgs/games/clonehero/default.nix
+++ b/pkgs/games/clonehero/default.nix
@@ -2,7 +2,7 @@
, stdenv
, fetchurl
, autoPatchelfHook
-, alsaLib
+, alsa-lib
, gtk2
, libXrandr
, libXScrnSaver
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
zlib
# Run-time libraries (loaded with dlopen)
- alsaLib # ALSA sound
+ alsa-lib # ALSA sound
libXrandr # X11 resolution detection
libXScrnSaver # X11 screensaver prevention
udev # udev input drivers
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index a5796f697ef1..3fb8236947f4 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, makeWrapper, pkg-config, nasm, makeDesktopItem
-, alsaLib, flac, gtk2, libvorbis, libvpx, libGLU, libGL
+, alsa-lib, flac, gtk2, libvorbis, libvpx, libGLU, libGL
, SDL2, SDL2_mixer }:
let
@@ -27,7 +27,7 @@ in stdenv.mkDerivation {
sha256 = "972630059be61ef9564a241b84ef2ee4f69fc85c19ee36ce46052ff2f1ce3bf9";
};
- buildInputs = [ alsaLib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ];
+ buildInputs = [ alsa-lib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ];
nativeBuildInputs = [ makeWrapper pkg-config ]
++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm;
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index 879bbfa2311f..9798d659322c 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem
-, alsaLib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL
+, alsa-lib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL
, libSM, libICE, libXext, factorio-utils
, releaseType
, mods ? []
@@ -182,7 +182,7 @@ let
buildInputs = [ libpulseaudio ];
libPath = lib.makeLibraryPath [
- alsaLib
+ alsa-lib
libpulseaudio
libX11
libXcursor
diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix
index 4d6795070ca2..07aad4a5b604 100644
--- a/pkgs/games/gambatte/default.nix
+++ b/pkgs/games/gambatte/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, scons, qt4, alsaLib }:
+{ lib, stdenv, fetchFromGitHub, scons, qt4, alsa-lib }:
stdenv.mkDerivation {
pname = "gambatte";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0cc6zcvxpvi5hgcssb1zy0fkj9nk7n0d2xm88a4v05kpm5zw7sh2";
};
- buildInputs = [ scons qt4 alsaLib ];
+ buildInputs = [ scons qt4 alsa-lib ];
patches = [ ./fix-scons-paths.patch ];
diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
index 3ec196b7373e..f16aa7526327 100644
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_mixer, alsaLib, libpng
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_mixer, alsa-lib, libpng
, pcre, makeDesktopItem }:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ SDL2 SDL2_mixer alsaLib libpng pcre ];
+ buildInputs = [ SDL2 SDL2_mixer alsa-lib libpng pcre ];
hardeningDisable = ["all"];
diff --git a/pkgs/games/methane/default.nix b/pkgs/games/methane/default.nix
index 17c9dc425677..071e1a64b545 100644
--- a/pkgs/games/methane/default.nix
+++ b/pkgs/games/methane/default.nix
@@ -16,7 +16,7 @@
, clanlib
, libXrender
, libmikmod
-, alsaLib
+, alsa-lib
}:
stdenv.mkDerivation rec {
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
clanlib
libXrender
libmikmod
- alsaLib
+ alsa-lib
];
installPhase = ''
diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix
index 7e1a0cba1760..732079238395 100644
--- a/pkgs/games/mindustry/default.nix
+++ b/pkgs/games/mindustry/default.nix
@@ -12,7 +12,7 @@
, pkg-config
, stb
, ant
-, alsaLib
+, alsa-lib
, glew
# Make the build version easily overridable.
@@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
buildInputs = lib.optionals enableClient [
SDL2
glew
- alsaLib
+ alsa-lib
];
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 3d0b53035edd..254c01fdf1b6 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -15,7 +15,7 @@
, pango
, cairo
, expat
-, alsaLib
+, alsa-lib
, cups
, dbus
, atk
@@ -45,13 +45,13 @@ let
curl
libpulseaudio
systemd
- alsaLib # needed for narrator
+ alsa-lib # needed for narrator
flite # needed for narrator
libXxf86vm # needed only for versions <1.13
];
libPath = lib.makeLibraryPath ([
- alsaLib
+ alsa-lib
atk
cairo
cups
diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix
index 84d8a6200015..4082e853aa30 100644
--- a/pkgs/games/nexuiz/default.nix
+++ b/pkgs/games/nexuiz/default.nix
@@ -3,7 +3,7 @@
unzip, zlib, curl, libjpeg, libpng, libvorbis, libtheora
, libogg, libmodplug
, # glx
- libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, libXxf86dga, alsaLib
+ libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, libXxf86dga, alsa-lib
, # sdl
SDL
}:
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ unzip ];
buildInputs = [
# glx
- libX11 libGLU libGL libXpm libXext libXxf86vm libXxf86dga alsaLib
+ libX11 libGLU libGL libXpm libXext libXxf86vm libXxf86dga alsa-lib
# sdl
SDL
];
diff --git a/pkgs/games/oh-my-git/default.nix b/pkgs/games/oh-my-git/default.nix
index 89dc1bdd50ea..542effa65965 100644
--- a/pkgs/games/oh-my-git/default.nix
+++ b/pkgs/games/oh-my-git/default.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
, makeDesktopItem
, stdenv
-, alsaLib
+, alsa-lib
, gcc-unwrapped
, git
, godot-export-templates
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
gcc-unwrapped.lib
git
libGLU
diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix
index 0c9c71e38d21..32e1ef4fca93 100644
--- a/pkgs/games/opendune/default.nix
+++ b/pkgs/games/opendune/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, pkg-config
-, alsaLib, libpulseaudio, SDL2, SDL2_image, SDL2_mixer }:
+, alsa-lib, libpulseaudio, SDL2, SDL2_image, SDL2_mixer }:
# - set the opendune configuration at ~/.config/opendune/opendune.ini:
# [opendune]
@@ -18,13 +18,13 @@ stdenv.mkDerivation rec {
};
configureFlags = [
- "--with-alsa=${lib.getLib alsaLib}/lib/libasound.so"
+ "--with-alsa=${lib.getLib alsa-lib}/lib/libasound.so"
"--with-pulse=${lib.getLib libpulseaudio}/lib/libpulse.so"
];
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsaLib libpulseaudio SDL2 SDL2_image SDL2_mixer ];
+ buildInputs = [ alsa-lib libpulseaudio SDL2 SDL2_image SDL2_mixer ];
enableParallelBuilding = true;
diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix
index 4cde6b032ee2..8a7573dd5841 100644
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs
, dotnetCorePackages, dotnetPackages, cacert
-, ffmpeg_4, alsaLib, SDL2, lttng-ust, numactl, alsaPlugins
+, ffmpeg_4, alsa-lib, SDL2, lttng-ust, numactl, alsa-plugins
}:
let
runtimeDeps = [
- ffmpeg_4 alsaLib SDL2 lttng-ust numactl
+ ffmpeg_4 alsa-lib SDL2 lttng-ust numactl
];
dotnet-sdk = dotnetCorePackages.sdk_5_0;
diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
index 7dbca783b67b..c29af6d810f5 100644
--- a/pkgs/games/planetaryannihilation/default.nix
+++ b/pkgs/games/planetaryannihilation/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk
+{ lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk
, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg }:
# TODO: use dynamic attributes once Nix 1.7 is out
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host"
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host"
wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64"
diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix
index 691406160d1d..25c6b4ddec09 100644
--- a/pkgs/games/quake3/quake3e/default.nix
+++ b/pkgs/games/quake3/quake3e/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, curl, libGL, libX11, libXxf86dga, alsaLib, libXrandr, libXxf86vm, libXext, fetchFromGitHub }:
+{ lib, stdenv, curl, libGL, libX11, libXxf86dga, alsa-lib, libXrandr, libXxf86vm, libXext, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "Quake3e";
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "1jvk8qd0mi0x8lslknhkfd8h6ridwca34c6qahsbmmpcgsvdv16s";
};
- buildInputs = [ curl libGL libX11 libXxf86dga alsaLib libXrandr libXxf86vm libXext ];
+ buildInputs = [ curl libGL libX11 libXxf86dga alsa-lib libXrandr libXxf86vm libXext ];
enableParallelBuilding = true;
postPatch = ''
sed -i -e 's#OpenGLLib = dlopen( dllname#OpenGLLib = dlopen( "${libGL}/lib/libGL.so"#' code/unix/linux_qgl.c
- sed -i -e 's#Sys_LoadLibrary( "libasound.so.2" )#Sys_LoadLibrary( "${alsaLib}/lib/libasound.so.2" )#' code/unix/linux_snd.c
+ sed -i -e 's#Sys_LoadLibrary( "libasound.so.2" )#Sys_LoadLibrary( "${alsa-lib}/lib/libasound.so.2" )#' code/unix/linux_snd.c
sed -i -e 's#Sys_LoadLibrary( "libXrandr.so.2" )#Sys_LoadLibrary( "${libXrandr}/lib/libXrandr.so.2" )#' code/unix/x11_randr.c
sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_randr.c
sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libXxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c
diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix
index 51dd4f908601..9a836c595087 100644
--- a/pkgs/games/residualvm/default.nix
+++ b/pkgs/games/residualvm/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib
+{ lib, stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsa-lib
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, openglSupport ? libGLSupported, libGLU, libGL ? null
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "99c419b13885a49bdfc10a50a3a6000fd1ba9504f6aae04c74b840ec6f57a963";
};
- buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ]
+ buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsa-lib ]
++ lib.optionals openglSupport [ libGL libGLU ];
configureFlags = [ "--enable-all-engines" ];
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index 68ccb894d992..b22d292f2070 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, nasm
-, alsaLib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib
+, alsa-lib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib
, Cocoa, AudioToolbox, Carbon, CoreMIDI, AudioUnit, cctools
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nasm ];
buildInputs = lib.optionals stdenv.isLinux [
- alsaLib
+ alsa-lib
] ++ lib.optionals stdenv.isDarwin [
Cocoa AudioToolbox Carbon CoreMIDI AudioUnit
] ++ [
diff --git a/pkgs/games/shticker-book-unwritten/default.nix b/pkgs/games/shticker-book-unwritten/default.nix
index 0179c7c86e87..7dbd5c257e89 100644
--- a/pkgs/games/shticker-book-unwritten/default.nix
+++ b/pkgs/games/shticker-book-unwritten/default.nix
@@ -6,7 +6,7 @@ let
in buildFHSUserEnv {
name = "shticker_book_unwritten";
targetPkgs = pkgs: with pkgs; [
- alsaLib
+ alsa-lib
xorg.libX11
xorg.libXcursor
xorg.libXext
diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix
index fe3dde7167b5..a0557eed9b12 100644
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@@ -136,7 +136,7 @@ in buildFHSUserEnv rec {
libGLU
libuuid
libbsd
- alsaLib
+ alsa-lib
# Loop Hero
libidn2
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 8e4f5b866bbc..765ecbed28f2 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -6,7 +6,7 @@ let
overridePkgs = lib.optionals (!runtimeOnly) (with pkgs; [
libgpgerror
libpulseaudio
- alsaLib
+ alsa-lib
openalSoft
libva1
libvdpau
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index 1512359d495f..70e1acb1f34f 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, nasm
-, gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis
+, gtk2, glib, ffmpeg, alsa-lib, libmad, libogg, libvorbis
, glew, libpulseaudio, udev
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake nasm ];
buildInputs = [
- gtk2 glib ffmpeg alsaLib libmad libogg libvorbis
+ gtk2 glib ffmpeg alsa-lib libmad libogg libvorbis
glew libpulseaudio udev
];
diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix
index 19f562d54af1..b0a49cc77d1f 100644
--- a/pkgs/games/teeworlds/default.nix
+++ b/pkgs/games/teeworlds/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsaLib
+{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsa-lib
, libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils
, nixosTests
}:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config icoutils ];
buildInputs = [
- python3 alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack
+ python3 alsa-lib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack
];
postInstall = ''
diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix
index a60ec15744cb..4a25d26f8cc5 100644
--- a/pkgs/games/vessel/default.nix
+++ b/pkgs/games/vessel/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, requireFile, SDL, libpulseaudio, alsaLib, runtimeShell }:
+{ lib, stdenv, requireFile, SDL, libpulseaudio, alsa-lib, runtimeShell }:
stdenv.mkDerivation rec {
name = "vessel-12082012";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
ld_preload = ./isatty.c;
libPath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ]
- + ":" + lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ;
+ + ":" + lib.makeLibraryPath [ SDL libpulseaudio alsa-lib ] ;
installPhase = ''
mkdir -p $out/libexec/strangeloop/vessel/
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index fb6cb93f7f24..38a0450168ef 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -3,7 +3,7 @@
, # required for both
unzip, libjpeg, zlib, libvorbis, curl
, # glx
- libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsaLib
+ libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsa-lib
, # sdl
SDL2
@@ -64,7 +64,7 @@ let
nativeBuildInputs = [ unzip ];
buildInputs = [ libjpeg zlib libvorbis curl ]
- ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsaLib.dev ]
+ ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ]
++ lib.optional withSDL [ SDL2.dev ];
sourceRoot = "Xonotic/source/darkplaces";
diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix
index 4b09cb170c04..59075d69c753 100644
--- a/pkgs/games/zandronum/fmod.nix
+++ b/pkgs/games/zandronum/fmod.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, fetchurl, alsaLib, libpulseaudio, undmg }:
+{ stdenv, lib, fetchurl, alsa-lib, libpulseaudio, undmg }:
let
bits = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64";
- libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libpulseaudio ];
+ libPath = lib.makeLibraryPath [ stdenv.cc.cc alsa-lib libpulseaudio ];
in
stdenv.mkDerivation rec {
diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix
index 085ad7902f5d..95beb8bcdf3f 100644
--- a/pkgs/misc/apulse/default.nix
+++ b/pkgs/misc/apulse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, alsaLib, cmake, pkg-config, glib
+{ lib, stdenv, fetchFromGitHub, alsa-lib, cmake, pkg-config, glib
, tracingSupport ? true, logToStderr ? true }:
let oz = x: if x then "1" else "0"; in
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
- buildInputs = [ alsaLib glib ];
+ buildInputs = [ alsa-lib glib ];
cmakeFlags = [
"-DWITH_TRACE=${oz tracingSupport}"
diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix
index 2019820510ef..5e35dcaebd0f 100644
--- a/pkgs/misc/emulators/atari++/default.nix
+++ b/pkgs/misc/emulators/atari++/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libSM, libX11, libICE, SDL, alsaLib, gcc-unwrapped, libXext }:
+{ lib, stdenv, fetchurl, libSM, libX11, libICE, SDL, alsa-lib, gcc-unwrapped, libXext }:
stdenv.mkDerivation rec {
pname = "atari++";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "04fm2ic2qi4a52mi72wcaxyrpll4k8vvchx3qrik8rhg3jrxgm47";
};
- buildInputs = [ libSM libX11 SDL libICE alsaLib gcc-unwrapped libXext ];
+ buildInputs = [ libSM libX11 SDL libICE alsa-lib gcc-unwrapped libXext ];
postFixup = ''
patchelf --set-rpath ${lib.makeLibraryPath buildInputs} "$out/bin/atari++"
diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix
index ff17833f690b..03e97743905b 100644
--- a/pkgs/misc/emulators/desmume/default.nix
+++ b/pkgs/misc/emulators/desmume/default.nix
@@ -3,7 +3,7 @@
, libXmu
, lua
, tinyxml
-, agg, alsaLib, soundtouch, openal
+, agg, alsa-lib, soundtouch, openal
, desktop-file-utils
, gtk2, gtkglext, libglade
, libGLU, libpcap, SDL, zziplib }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
CXXFLAGS = "-fpermissive";
buildInputs =
- [ pkg-config libtool intltool libXmu lua agg alsaLib soundtouch
+ [ pkg-config libtool intltool libXmu lua agg alsa-lib soundtouch
openal desktop-file-utils gtk2 gtkglext libglade
libGLU libpcap SDL zziplib tinyxml ];
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 116279145603..8e08be28eda8 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkg-config, cmake
, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext
, libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama
-, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib
+, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsa-lib
, miniupnpc, enet, mbedtls, soundtouch, sfml
, vulkan-loader ? null, libpulseaudio ? null
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml
qtbase
] ++ lib.optionals stdenv.isLinux [
- bluez udev libevdev alsaLib vulkan-loader
+ bluez udev libevdev alsa-lib vulkan-loader
] ++ lib.optionals stdenv.isDarwin [
CoreBluetooth OpenGL ForceFeedback IOKit
];
diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
index 458b27d33044..4cb5ca9ec2e6 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, boost, eigen
-, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive
+, freeimage, freetype, libGLU, libGL, SDL2, alsa-lib, libarchive
, fetchpatch }:
stdenv.mkDerivation {
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
];
nativeBuildInputs = [ pkg-config cmake ];
- buildInputs = [ alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ];
+ buildInputs = [ alsa-lib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ];
installPhase = ''
install -D ../emulationstation $out/bin/emulationstation
diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix
index 7cdd88d0b941..f70e90e98722 100644
--- a/pkgs/misc/emulators/epsxe/default.nix
+++ b/pkgs/misc/emulators/epsxe/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL,
+{ lib, stdenv, fetchurl, alsa-lib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL,
libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }:
with lib;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
sourceRoot = ".";
buildInputs = [
- alsaLib
+ alsa-lib
curl
gdk-pixbuf
glib
diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index c7bc7e9f976e..8e10b7bb3154 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -4,7 +4,7 @@
, udev
, libGLU, libGL, SDL2
, libao, openal, libpulseaudio
-, alsaLib
+, alsa-lib
, gtk2, gtksourceview
, runtimeShell
# Darwin dependencies
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
++ optionals stdenv.isDarwin [ libicns ];
buildInputs = [ SDL2 libao ]
- ++ optionals stdenv.isLinux [ alsaLib udev libpulseaudio openal
+ ++ optionals stdenv.isLinux [ alsa-lib udev libpulseaudio openal
gtk2 gtksourceview libX11 libXv
libGLU libGL ]
++ optionals stdenv.isDarwin [ Carbon Cocoa OpenGL OpenAL ];
diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix
index 1b00a55fe058..e8feb1ea7ed5 100644
--- a/pkgs/misc/emulators/kega-fusion/default.nix
+++ b/pkgs/misc/emulators/kega-fusion/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }:
+{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsa-lib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }:
let
- libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ];
+ libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsa-lib libSM libX11 gdk-pixbuf pango libXinerama ];
in stdenv.mkDerivation {
pname = "kega-fusion";
diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix
index e803a1306833..26abda81b309 100644
--- a/pkgs/misc/emulators/mame/default.nix
+++ b/pkgs/misc/emulators/mame/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper
-, python, pkg-config, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama
+, python, pkg-config, SDL2, SDL2_ttf, alsa-lib, which, qtbase, libXinerama
, libpcap, CoreAudioKit, ForceFeedback
, installShellFiles }:
@@ -41,7 +41,7 @@ in mkDerivation {
buildInputs =
[ SDL2 SDL2_ttf qtbase libXinerama ]
- ++ lib.optional stdenv.isLinux alsaLib
+ ++ lib.optional stdenv.isLinux alsa-lib
++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ]
;
nativeBuildInputs = [ python pkg-config which makeWrapper installShellFiles ];
diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index aaf736f3e5e4..f76ddb78bd56 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, freeglut, libGLU, libGL, libcdio, libjack2
-, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsaLib }:
+, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsa-lib }:
stdenv.mkDerivation rec {
pname = "mednafen";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
libGLU libGL
libcdio
libjack2
- alsaLib
+ alsa-lib
libsamplerate
libsndfile
libX11
diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix
index 502e5c647237..e19b97a477ef 100644
--- a/pkgs/misc/emulators/nestopia/default.nix
+++ b/pkgs/misc/emulators/nestopia/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3
+{ lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsa-lib, gtk3
, makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils
, epoxy, gdk-pixbuf, gnome, wrapGAppsHook
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [
SDL2
- alsaLib
+ alsa-lib
epoxy
gtk3
gdk-pixbuf
diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix
index d34a921e1773..61d416e17ac8 100644
--- a/pkgs/misc/emulators/openmsx/default.nix
+++ b/pkgs/misc/emulators/openmsx/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config
, python
-, alsaLib, glew, libGL, libpng
+, alsa-lib, glew, libGL, libpng
, libogg, libtheora, libvorbis
, SDL2, SDL2_image, SDL2_ttf
, freetype, tcl, zlib
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config python ];
- buildInputs = [ alsaLib glew libGL libpng
+ buildInputs = [ alsa-lib glew libGL libpng
libogg libtheora libvorbis freetype
SDL2 SDL2_image SDL2_ttf tcl zlib ];
diff --git a/pkgs/misc/emulators/pcem/default.nix b/pkgs/misc/emulators/pcem/default.nix
index 6e7e3bc6379c..2e6aa683e4d3 100644
--- a/pkgs/misc/emulators/pcem/default.nix
+++ b/pkgs/misc/emulators/pcem/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip, wxGTK31, coreutils, SDL2, openal, alsaLib, pkg-config
+{ stdenv, lib, fetchzip, wxGTK31, coreutils, SDL2, openal, alsa-lib, pkg-config
, autoreconfHook, withNetworking ? true, withALSA ? true }:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ wxGTK31 coreutils SDL2 openal ]
- ++ lib.optional withALSA alsaLib;
+ ++ lib.optional withALSA alsa-lib;
configureFlags = [ "--enable-release-build" ]
++ lib.optional withNetworking "--enable-networking"
diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix
index 476ea7122cba..13d2ea74f342 100644
--- a/pkgs/misc/emulators/pcsx2/default.nix
+++ b/pkgs/misc/emulators/pcsx2/default.nix
@@ -1,4 +1,4 @@
-{ alsaLib
+{ alsa-lib
, cmake
, fetchFromGitHub
, fmt
@@ -71,7 +71,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake makeWrapper perl pkg-config wrapGAppsHook ];
buildInputs = [
- alsaLib
+ alsa-lib
fmt
gettext
glib
diff --git a/pkgs/misc/emulators/punes/default.nix b/pkgs/misc/emulators/punes/default.nix
index 68f48bc7b403..0d2a5b117984 100644
--- a/pkgs/misc/emulators/punes/default.nix
+++ b/pkgs/misc/emulators/punes/default.nix
@@ -11,7 +11,7 @@
, pkg-config
, ffmpeg
, libGLU
-, alsaLib
+, alsa-lib
, sndio
}:
@@ -34,7 +34,7 @@ mkDerivation rec {
nativeBuildInputs = [ autoreconfHook cmake pkg-config qttools ];
buildInputs = [ ffmpeg qtbase qtsvg libGLU ]
- ++ lib.optionals stdenv.hostPlatform.isLinux [ alsaLib ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]
++ lib.optionals stdenv.hostPlatform.isBSD [ sndio ];
dontUseCmakeConfigure = true;
diff --git a/pkgs/misc/emulators/reicast/default.nix b/pkgs/misc/emulators/reicast/default.nix
index 8c0bc30d4384..f9e8e4d69376 100644
--- a/pkgs/misc/emulators/reicast/default.nix
+++ b/pkgs/misc/emulators/reicast/default.nix
@@ -3,7 +3,7 @@
, cmake
, pkg-config
, curl
-, alsaLib
+, alsa-lib
, libGLU
, libX11
, libevdev
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
curl
- alsaLib
+ alsa-lib
libGLU
libX11
libevdev
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 7153c378f8a3..bddabede0a07 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, fetchpatch, cmake, pkg-config, makeWrapper, python27, python3, retroarch
-, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
+, alsa-lib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
, ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump
, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl
, buildPackages }:
@@ -548,7 +548,7 @@ in with lib.licenses;
description = "Port of MAME to libretro";
license = gpl2Plus;
- extraBuildInputs = [ alsaLib libGLU libGL portaudio python27 xorg.libX11 ];
+ extraBuildInputs = [ alsa-lib libGLU libGL portaudio python27 xorg.libX11 ];
postPatch = ''
# Prevent the failure during the parallel building of:
# make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o
@@ -617,7 +617,7 @@ in with lib.licenses;
description = "Port of MAME ~2015 to libretro";
license = gpl2Plus;
extraNativeBuildInputs = [ python27 ];
- extraBuildInputs = [ alsaLib ];
+ extraBuildInputs = [ alsa-lib ];
makefile = "Makefile";
};
@@ -638,7 +638,7 @@ in with lib.licenses;
description = "Port of MAME ~2016 to libretro";
license = gpl2Plus;
extraNativeBuildInputs = [ python27 ];
- extraBuildInputs = [ alsaLib ];
+ extraBuildInputs = [ alsa-lib ];
postPatch = ''
# Prevent the failure during the parallel building of:
# make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index e6f1b4f1a785..86ca803d965a 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, which, pkg-config, makeWrapper
, ffmpeg, libGLU, libGL, freetype, libxml2, python3
, libobjc, AppKit, Foundation
-, alsaLib ? null
+, alsa-lib ? null
, libdrm ? null
, libpulseaudio ? null
, libv4l ? null
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
++ optional enableNvidiaCgToolkit nvidia_cg_toolkit
++ optional withVulkan vulkan-loader
++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ]
- ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11
+ ++ optionals stdenv.isLinux [ alsa-lib libdrm libpulseaudio libv4l libX11
libXdmcp libXext libXxf86vm mesa udev
wayland libxkbcommon ];
diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix
index 8eab2f057207..bf1dc1c95732 100644
--- a/pkgs/misc/emulators/rpcs3/default.nix
+++ b/pkgs/misc/emulators/rpcs3/default.nix
@@ -4,7 +4,7 @@
, sdl2Support ? true, SDL2
, pulseaudioSupport ? true, libpulseaudio
, waylandSupport ? true, wayland
-, alsaSupport ? true, alsaLib
+, alsaSupport ? true, alsa-lib
}:
let
@@ -50,7 +50,7 @@ mkDerivation {
libevdev zlib libusb1 curl python3
] ++ lib.optional sdl2Support SDL2
++ lib.optional pulseaudioSupport libpulseaudio
- ++ lib.optional alsaSupport alsaLib
+ ++ lib.optional alsaSupport alsa-lib
++ lib.optional waylandSupport wayland;
meta = with lib; {
diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix
index 11be67b6d9ea..84837322e971 100644
--- a/pkgs/misc/emulators/ruffle/default.nix
+++ b/pkgs/misc/emulators/ruffle/default.nix
@@ -1,4 +1,4 @@
-{ alsaLib
+{ alsa-lib
, fetchFromGitHub
, makeWrapper
, openssl
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
openssl
wayland
xorg.libX11
diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix
index 75b86eaeebd1..803efe5149c2 100644
--- a/pkgs/misc/emulators/uae/default.nix
+++ b/pkgs/misc/emulators/uae/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, pkg-config, gtk2, alsaLib, SDL}:
+{lib, stdenv, fetchurl, pkg-config, gtk2, alsa-lib, SDL}:
stdenv.mkDerivation rec {
name = "uae-0.8.29";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ];
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ gtk2 alsaLib SDL ];
+ buildInputs = [ gtk2 alsa-lib SDL ];
hardeningDisable = [ "format" ];
LDFLAGS = [ "-lm" ];
diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix
index 7d63927e33f6..f8b9e5906f3e 100644
--- a/pkgs/misc/emulators/vice/default.nix
+++ b/pkgs/misc/emulators/vice/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU, libGL, libXaw
+{ lib, stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsa-lib, readline, libGLU, libGL, libXaw
, pkg-config, gtk2, SDL, autoreconfHook, makeDesktopItem
}:
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y";
};
- buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU libGL
+ buildInputs = [ bison flex perl libpng giflib libjpeg alsa-lib readline libGLU libGL
pkg-config gtk2 SDL autoreconfHook libXaw ];
dontDisableStatic = true;
configureFlags = [ "--enable-fullscreen --enable-gnomeui" ];
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 8553ab836455..0023d9878b36 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ lib.optional gphoto2Support pkgs.libgphoto2
++ lib.optional ldapSupport pkgs.openldap
++ lib.optional fontconfigSupport pkgs.fontconfig
- ++ lib.optional alsaSupport pkgs.alsaLib
+ ++ lib.optional alsaSupport pkgs.alsa-lib
++ lib.optional pulseaudioSupport pkgs.libpulseaudio
++ lib.optional xineramaSupport pkgs.xorg.libXinerama
++ lib.optional udevSupport pkgs.udev
diff --git a/pkgs/misc/emulators/yuzu/base.nix b/pkgs/misc/emulators/yuzu/base.nix
index c2b8061485b5..1160a5fc1e7f 100644
--- a/pkgs/misc/emulators/yuzu/base.nix
+++ b/pkgs/misc/emulators/yuzu/base.nix
@@ -1,7 +1,7 @@
{ pname, version, src, branchName
, stdenv, lib, fetchFromGitHub, fetchpatch, wrapQtAppsHook
, cmake, pkg-config
-, libpulseaudio, libjack2, alsaLib, sndio
+, libpulseaudio, libjack2, alsa-lib, sndio
, vulkan-loader, vulkan-headers
, qtbase, qtwebengine, qttools
, nlohmann_json, rapidjson
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [
- libpulseaudio libjack2 alsaLib sndio
+ libpulseaudio libjack2 alsa-lib sndio
vulkan-loader vulkan-headers
qtbase qtwebengine qttools
nlohmann_json rapidjson
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 865ab6ee1f31..7474a304f032 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -5,7 +5,7 @@
, aften, AudioUnit, CoreAudio, libobjc, Accelerate
# Optional Dependencies
-, dbus ? null, libffado ? null, alsaLib ? null
+, dbus ? null, libffado ? null, alsa-lib ? null
, libopus ? null
# Extra options
@@ -22,7 +22,7 @@ let
optDbus = if stdenv.isDarwin then null else shouldUsePkg dbus;
optPythonDBus = if libOnly then null else shouldUsePkg dbus-python;
optLibffado = if libOnly then null else shouldUsePkg libffado;
- optAlsaLib = if libOnly then null else shouldUsePkg alsaLib;
+ optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib;
optLibopus = shouldUsePkg libopus;
in
stdenv.mkDerivation rec {
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index c1ccc668487a..aebe32497c1d 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -1,13 +1,13 @@
{ lib, stdenv, fetchurl, pkg-config
# Optional Dependencies
-, alsaLib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null
+, alsa-lib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null
}:
let
shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;
- optAlsaLib = shouldUsePkg alsaLib;
+ optAlsaLib = shouldUsePkg alsa-lib;
optDb = shouldUsePkg db;
optLibuuid = shouldUsePkg libuuid;
optLibffado = shouldUsePkg libffado;
diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix
index 3b4c34702d3c..9e4035801f1e 100644
--- a/pkgs/misc/sndio/default.nix
+++ b/pkgs/misc/sndio/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, fixDarwinDylibNames }:
+{ lib, stdenv, fetchurl, alsa-lib, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
pname = "sndio";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
- buildInputs = lib.optional stdenv.hostPlatform.isLinux alsaLib;
+ buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib;
enableParallelBuilding = true;
diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix
index af2ce3f53cf2..fc7062d904c3 100644
--- a/pkgs/misc/solfege/default.nix
+++ b/pkgs/misc/solfege/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook
, buildPythonApplication, pycairo, pygobject3
, gobject-introspection, gtk3, librsvg
-, alsaUtils, timidity, mpg123, vorbis-tools, csound, lilypond
+, alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond
}:
buildPythonApplication rec {
@@ -24,7 +24,7 @@ buildPythonApplication rec {
propagatedBuildInputs = [ pycairo pygobject3 ];
preBuild = ''
- sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \
+ sed -i -e 's|wav_player=.*|wav_player=${alsa-utils}/bin/aplay|' \
-e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \
-e 's|mp3_player=.*|mp3_player=${mpg123}/bin/mpg123|' \
-e 's|ogg_player=.*|ogg_player=${vorbis-tools}/bin/ogg123|' \
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index f1a062646883..a7fdb5fd9193 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -413,12 +413,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-06-06";
+ version = "2021-06-09";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "00fe69a21e128d0378d1e00eb5334cde9cd7a227";
- sha256 = "0nrcxsf00x2ygh16965d6fp5lhjq7hg9wzqgail2l0pwjdxnizm4";
+ rev = "eaee30fe7afdbce73f92d0c766f4b411c8de5525";
+ sha256 = "0b73k55zfhd4ygqiwwps17fp9nksbs8km57vfl0y85vb3ajzg0l6";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -557,12 +557,12 @@ final: prev:
coc-nvim = buildVimPluginFrom2Nix {
pname = "coc-nvim";
- version = "2021-06-04";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
- rev = "06d950e547e8fa1a775399ae5eeb70603084b109";
- sha256 = "1fj8v8zm0w04fyxf12ck4lc3gwq6bxh5shmwc24j0sar3ki0i4rz";
+ rev = "898335d52ed925e8dd5dd3da3c25470d352b2e11";
+ sha256 = "19ks20v1mjm5yrhlrkxqpmsc8jz2nfz5w38ixfkpbhdj3qwdf5gg";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
@@ -617,12 +617,12 @@ final: prev:
command-t = buildVimPluginFrom2Nix {
pname = "command-t";
- version = "2021-03-14";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "wincent";
repo = "command-t";
- rev = "a7ce436b211a7ac1f47cfd440370653e33c2a1d5";
- sha256 = "1yfcbh9q35w1ckdv8isbwjwlgnjnjmqm8yc7bcbfirkx9pjlsw2z";
+ rev = "6a00a2cabfb5ee3f49ff556ceea56892825c0397";
+ sha256 = "0z2zr2mfc5m4xn8b0j0br7q96hs42md5wd53viv0zmw67i2pnbcs";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/wincent/command-t/";
@@ -774,12 +774,12 @@ final: prev:
conjure = buildVimPluginFrom2Nix {
pname = "conjure";
- version = "2021-05-31";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "Olical";
repo = "conjure";
- rev = "31820e386ce7a32488ad6b19033c17a8f05c36bf";
- sha256 = "1p35blgnd99kggwyiag6drx3v6zqx50ypxnfvvij102ws50144fk";
+ rev = "643ae9bf5f08e752a22027628b69a31ce271f1b5";
+ sha256 = "0jbd1y0riq6xdyh0x5msw8475b7v0viapgkmawyda3ax8bczb3jv";
};
meta.homepage = "https://github.com/Olical/conjure/";
};
@@ -810,12 +810,12 @@ final: prev:
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
- version = "2021-06-01";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
- rev = "5f92ee08b9c0018df244de47dc6e2ed4ba232a64";
- sha256 = "16xfkblsn149v9rgqjcimaw380xv6l8gimfaj368gh9h2icaz9qc";
+ rev = "2f1c81a86342e333a916a1bc7db5218cf115a191";
+ sha256 = "0ysnsixa7zy4plxr2qm2phyvl63qnmszjh3d8cbr4852klmv0shw";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@@ -1304,12 +1304,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview-nvim";
- version = "2021-06-03";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
- rev = "e174aa0a1e8a65fd9699f190c67fd197c2afa09f";
- sha256 = "0skzir27vzg5h8w0c7hj2p2i0540m768i1vbgqwpgz7y7wkgpbcm";
+ rev = "93c3aba19c54a7e68fab6c9864eff499a744b4cc";
+ sha256 = "01s43bg2y0yb5h7gkr75j23i5jy5acaz0m65nbx5c6x1lbm7fy20";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@@ -1364,12 +1364,12 @@ final: prev:
edge = buildVimPluginFrom2Nix {
pname = "edge";
- version = "2021-05-22";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "edge";
- rev = "af858776b6faf81b9eb50f8bbb87c639ee483c93";
- sha256 = "07smppxp2wr4282vsz0zdx3kkhvrx9f5140dwx4h4p8chs1c1zc5";
+ rev = "d1fa03e861b514aa485b6b1369ebb4cc34d4a817";
+ sha256 = "1v28cl52bfxl9c12bk0hnr14nn8mp5wg6qqp5ycmsw44rbg18vh4";
};
meta.homepage = "https://github.com/sainnhe/edge/";
};
@@ -1799,12 +1799,12 @@ final: prev:
gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns-nvim";
- version = "2021-06-06";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "lewis6991";
repo = "gitsigns.nvim";
- rev = "0d8db4531a508f875d98b55f5e78bc1c560d6342";
- sha256 = "1avp9df2lbiczycgfiigbyny8s6srjw6h88a88161m29g2mznr2s";
+ rev = "b5a6c6c0cbac430d61965be1fac5b984d3c9c469";
+ sha256 = "19k96irs8saibjxah457ir418l3aih1rp3arj6b1m14p3yf2dxy3";
};
meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
};
@@ -1821,6 +1821,18 @@ final: prev:
meta.homepage = "https://github.com/gregsexton/gitv/";
};
+ gleam-vim = buildVimPluginFrom2Nix {
+ pname = "gleam-vim";
+ version = "2020-06-24";
+ src = fetchFromGitHub {
+ owner = "gleam-lang";
+ repo = "gleam.vim";
+ rev = "847a5ef57c2faef2774242c87f711d1131b89fe6";
+ sha256 = "17kjby64zdnmhyia1cx9jnk4mss0gca1jz1m4hff9rl63i56bql1";
+ };
+ meta.homepage = "https://github.com/gleam-lang/gleam.vim/";
+ };
+
glow-nvim = buildVimPluginFrom2Nix {
pname = "glow-nvim";
version = "2021-05-29";
@@ -1895,24 +1907,24 @@ final: prev:
gruvbox-flat-nvim = buildVimPluginFrom2Nix {
pname = "gruvbox-flat-nvim";
- version = "2021-05-28";
+ version = "2021-06-09";
src = fetchFromGitHub {
owner = "eddyekofo94";
repo = "gruvbox-flat.nvim";
- rev = "521d9234d1c8c3a0e9dc782a8f2e5776483856b0";
- sha256 = "1k92z847ix3c7kwiyiw4x41z2sid2wyyjgv08myh93k0ivb5y4qh";
+ rev = "0b27de51438f62870f1558ef9c27cb20caec69cf";
+ sha256 = "0k9hqjw857ri0vbgjncbbfgh0yh1bpqr25vj0drp9wiakn5pywqf";
};
meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/";
};
gruvbox-nvim = buildVimPluginFrom2Nix {
pname = "gruvbox-nvim";
- version = "2021-06-05";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "npxbr";
repo = "gruvbox.nvim";
- rev = "ad076d46c76b884d7b555067d3434b3666c3b80b";
- sha256 = "0m4ks6gxh3clg4vg1rxyvhjjkmmwipb9s38zwbaidfqwifldjriy";
+ rev = "2dc25bb14fbd69f888dd0615c5576dd730de869a";
+ sha256 = "1i87f7vfgk1szy18cg7nng2yqvcny4v1wnh4dbw74lcqmmazgi7y";
};
meta.homepage = "https://github.com/npxbr/gruvbox.nvim/";
};
@@ -2123,12 +2135,12 @@ final: prev:
indent-blankline-nvim-lua = buildVimPluginFrom2Nix {
pname = "indent-blankline-nvim-lua";
- version = "2021-04-28";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
- rev = "ec5816267caa5fdde7a5e5a8359b9b19bc8ecf49";
- sha256 = "008q3rg6fz36k334ci30f1vci9hws4y04z8gr4wnq9q8qx57y7nh";
+ rev = "4e1004b4efcb8f4bbb29d69dd4898ed14120a973";
+ sha256 = "1y1skj9q29sk7dfza1s21gfwyjfk49v5b298br39xiankin1b8jx";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
@@ -2292,12 +2304,12 @@ final: prev:
julia-vim = buildVimPluginFrom2Nix {
pname = "julia-vim";
- version = "2021-05-20";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "JuliaEditorSupport";
repo = "julia-vim";
- rev = "2f35033a2141eea7a5a89ef8be438985781a9fcf";
- sha256 = "1d7xl7i5xl4mnpx7bl9cnf23x48lc6ambhgb98phzdsb0kzjhv3n";
+ rev = "69673e40a3c9c6532c1500ba92fed93ccd55af90";
+ sha256 = "07nh2pdl09z6k6bzfsbxyna1rccji7s1sz6z4lmhi6fdi7wjby7j";
};
meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";
};
@@ -2388,11 +2400,11 @@ final: prev:
LeaderF = buildVimPluginFrom2Nix {
pname = "LeaderF";
- version = "2021-06-03";
+ version = "2021-06-09";
src = fetchFromGitHub {
owner = "Yggdroot";
repo = "LeaderF";
- rev = "3849b6440299215e5168d569713d2a5540dfbf2b";
+ rev = "183fa5f3203983fed87174e6f193f271133fe974";
sha256 = "17if75p3x4lkqncl296f3jdq0rcc69b0mgj0dbz6cl851bmqvy40";
};
meta.homepage = "https://github.com/Yggdroot/LeaderF/";
@@ -2400,12 +2412,12 @@ final: prev:
lean-vim = buildVimPluginFrom2Nix {
pname = "lean-vim";
- version = "2021-06-04";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "leanprover";
repo = "lean.vim";
- rev = "fdf448398335434f4b5c45aff5f4ee64a3d090fa";
- sha256 = "0wi7837yy4x89w6gw72qkaxbb0vdm3hlxnkjplg2g4ibpayxx3s4";
+ rev = "48ac5798b74b8ef8212adc70048ff0ed6f4e1976";
+ sha256 = "08n8zfglml4v983nnm8gg25vggg5cfjsqrm96k8s3j5wmzi95mhx";
};
meta.homepage = "https://github.com/leanprover/lean.vim/";
};
@@ -2592,12 +2604,12 @@ final: prev:
lsp_signature-nvim = buildVimPluginFrom2Nix {
pname = "lsp_signature-nvim";
- version = "2021-06-03";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "ray-x";
repo = "lsp_signature.nvim";
- rev = "5aca93b10b571a8dfafd2c9e850239dfa2094a6f";
- sha256 = "1k8k7zq03jnvh4328i0s0d87g9s5y2yc94wnpg059clmp1cizcq4";
+ rev = "88272b6d89e8140a35099ea563978172f2776dc9";
+ sha256 = "013ffydnhjwzj0y106m0x65zx31kabsxrs86ndq2vik3pc6vyslq";
};
meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
};
@@ -3048,12 +3060,12 @@ final: prev:
neogit = buildVimPluginFrom2Nix {
pname = "neogit";
- version = "2021-06-03";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "TimUntersberger";
repo = "neogit";
- rev = "f0a22c4609e6f090afdcb147242a2e96ac763f4a";
- sha256 = "09y03krzg2wl0mlgvc3shvdbvjr8ga69amknbfzvnmplmqyji0g5";
+ rev = "55dcb4206324e3f90dd9dd41bed22fc6d4887098";
+ sha256 = "0iiblvqmn7xg3mpyppzng081wgpdfrdn9jpa3ijr2ly6w5jg0yqa";
};
meta.homepage = "https://github.com/TimUntersberger/neogit/";
};
@@ -3264,12 +3276,12 @@ final: prev:
nnn-vim = buildVimPluginFrom2Nix {
pname = "nnn-vim";
- version = "2021-05-30";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "mcchrish";
repo = "nnn.vim";
- rev = "fb80ed60c642b1f3666125c3051bd2da34453eeb";
- sha256 = "1p87dc296icb2kpyzlflpzbaq5z2yg106mpsxxzmwzn949smsk7l";
+ rev = "abf700104c0450bac10be3ece613ff88997f47e4";
+ sha256 = "0s3z5kd2h8cx6lplvg3yqp2pacx8c7kcavpvwnl71vmi0s2ld85s";
};
meta.homepage = "https://github.com/mcchrish/nnn.vim/";
};
@@ -3288,12 +3300,12 @@ final: prev:
nord-nvim = buildVimPluginFrom2Nix {
pname = "nord-nvim";
- version = "2021-06-02";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "shaunsingh";
repo = "nord.nvim";
- rev = "6965333869ca172a18606c93d6f6c1275fb9aabb";
- sha256 = "0nljk4ncxz5syf0wr29j3bdxdw5bjpjn879ls1r910hicn4lg468";
+ rev = "f6464fa295005049c07650f41b06c0216c3c112d";
+ sha256 = "124qxhi9ckjqhxwj8wlxd6srlalmhpr58pidpvvdpvzcpp205yr2";
};
meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
};
@@ -3336,48 +3348,48 @@ final: prev:
nvim-autopairs = buildVimPluginFrom2Nix {
pname = "nvim-autopairs";
- version = "2021-06-06";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "windwp";
repo = "nvim-autopairs";
- rev = "64c937940c2d890bd192a56e1a831e378fe0168b";
- sha256 = "05pa2zz7dwzfjsgz8chv0wkx202f8x3plbxyczlkp390sfhqk0nn";
+ rev = "34a02b4f37a99b80eff03dff90c675b7374af54b";
+ sha256 = "0vz610ifrzzish5qysz8pz7w0zcfhm0q0xvya3r48fgs12ipahmq";
};
meta.homepage = "https://github.com/windwp/nvim-autopairs/";
};
nvim-base16 = buildVimPluginFrom2Nix {
pname = "nvim-base16";
- version = "2021-05-27";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "RRethy";
repo = "nvim-base16";
- rev = "4388bb114a9c153cbe8c5745f6c3cb92edc9bf4b";
- sha256 = "0ivgdl0biiz91g5s0riva77ybzp33driwm7p7fwl94czqgyjjqc4";
+ rev = "b53dbb4d33a77e1b9b16672565749d6990e84cf0";
+ sha256 = "1fwb797jcp5xkrfcqqljlhpnggkj3wfrc6zb0h662i35yhbhnin8";
};
meta.homepage = "https://github.com/RRethy/nvim-base16/";
};
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
- version = "2021-06-06";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
- rev = "85b05cdc0ce371b055504be5d16cdfb1ea110f22";
- sha256 = "0sr3rcy5mw0gx06x12dqc4bsb2ypc2xvcr6cqzw4w8w520ys7aid";
+ rev = "2063533b0f496ac7047fa9c58937d2a35b995dbe";
+ sha256 = "1k95dyrqcy88b0s8jsijgx7mpnfmw2ay2fzj3bhbdqagdghsgpp4";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
nvim-bufferline-lua = buildVimPluginFrom2Nix {
pname = "nvim-bufferline-lua";
- version = "2021-06-01";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "akinsho";
repo = "nvim-bufferline.lua";
- rev = "883cd1b0d8029c97bb6c3358b8e55c040b0c7bcb";
- sha256 = "06mcl11jx56wym2jfinpbklpfn55d6j35yy80dv9dy8072mb5f9f";
+ rev = "7b510d5241fb29f5a5e985e02c4cfa046ec4ee3e";
+ sha256 = "1ahy4v7z08l0z6c7v19dik8icw943kc243vlzhs1bfa4aj13nncs";
};
meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
};
@@ -3408,12 +3420,12 @@ final: prev:
nvim-compe = buildVimPluginFrom2Nix {
pname = "nvim-compe";
- version = "2021-06-02";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "hrsh7th";
repo = "nvim-compe";
- rev = "310488302c6532646adfe8228e40187a80b36ac5";
- sha256 = "1anfrybaliyaxgi8iv55hncnac8xgizqw9b9047lw2grkybmrdn4";
+ rev = "c459c3f3a18c7ff7a312593c481af2b90fa01655";
+ sha256 = "148k41db7ncri3mgdhc13mi4xk7chdchbgf42zldhcrf05y3xd58";
};
meta.homepage = "https://github.com/hrsh7th/nvim-compe/";
};
@@ -3432,24 +3444,24 @@ final: prev:
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
- version = "2021-06-03";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
- rev = "826a1931fdf1b3b67a0b456aa3abc1b72185a7a7";
- sha256 = "0g8x9vk9qv16zlbvx3h8w2vhnqyycssn5v4y8sdhsnhyjljsjygz";
+ rev = "dfacc1fb7aeb0789c4fd27004e312cf363becba5";
+ sha256 = "058kjgngg7l37q9zbfz0xfqajx526m4cp85i3chcsfrvp99c7mzv";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
nvim-dap-ui = buildVimPluginFrom2Nix {
pname = "nvim-dap-ui";
- version = "2021-06-05";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "nvim-dap-ui";
- rev = "3c221fe2cc2d675ebf8c83bb62e0b44516ae34ae";
- sha256 = "0hcfs9c5m610sh5105kd4qbgj8ikfds7zfh2hcf1ly5ikkbz1ma4";
+ rev = "9190b4a625a449927ffc3777b45db6cb392dc8f6";
+ sha256 = "1gai54z6w4dw17irwnwfd35k8zy2aiws2ia9vqamzicaf0n8axr8";
};
meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
};
@@ -3468,12 +3480,12 @@ final: prev:
nvim-gdb = buildVimPluginFrom2Nix {
pname = "nvim-gdb";
- version = "2021-05-30";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "sakhnik";
repo = "nvim-gdb";
- rev = "60994408e6684fb776bcfb80c456cbdf8bc6eb93";
- sha256 = "044bgiyhi4db5avajry9v168gz55xn6yzr83j610k95hh2aam08a";
+ rev = "53bfce7a254651469ce9577349811bc76d9af46c";
+ sha256 = "1xcwrjfvikb1qqyaic2m0fi12l0hmxj0y5mwx1h95karpydbb0rz";
};
meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
};
@@ -3540,12 +3552,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-06-03";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "62c04242031ed65a8d29ebefaaf645e8e3375748";
- sha256 = "1g1s85dzz7lr3ky90m27m8f3s06xm4c87z96vwzaaajb28927774";
+ rev = "f95be0c947237edb88df148dd61790988ab3a23e";
+ sha256 = "1cddnkil9xid7xq3k0iszk12ma9pi396khqx6dzh2z9p7nkhk2rg";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -3624,24 +3636,24 @@ final: prev:
nvim-tree-lua = buildVimPluginFrom2Nix {
pname = "nvim-tree-lua";
- version = "2021-06-05";
+ version = "2021-06-09";
src = fetchFromGitHub {
owner = "kyazdani42";
repo = "nvim-tree.lua";
- rev = "82f1598bd4388c8089cf08007b17a3555c0328f0";
- sha256 = "1mpszdypmhw3zizm699rq1m3zfrzmn1ilqaha01zb3q64l7mddzc";
+ rev = "906a35cd0e7520eaff369688cb0a090240d7c2b9";
+ sha256 = "18nw0xm4dp45v9s9kn0cmjwxdwydgr5f1v2kgm6h6kc1wvvd5scj";
};
meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
};
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
- version = "2021-06-04";
+ version = "2021-06-06";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "b5d603a876fe8c89e96a9cac2dac2dd375479dac";
- sha256 = "1x2cn0v7yyqlwz8g4vqxh0vai372946a1akbg50pldq24jxm8j0q";
+ rev = "37ed50f28f8350de8dc70b56d8ac198aac9b1178";
+ sha256 = "16mmjpk0pqqshlw1qj3zxx197iv4g7mscgfya17c7r03rybz0q19";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -3840,12 +3852,12 @@ final: prev:
packer-nvim = buildVimPluginFrom2Nix {
pname = "packer-nvim";
- version = "2021-06-03";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "wbthomason";
repo = "packer.nvim";
- rev = "3715ce44c0aae69471511bd93789ccf578c9684c";
- sha256 = "1xcfmv7dn975hqa1izn4h80vpn3yksm8ali6nbxv62sij6m9na48";
+ rev = "d21e0e2c157af0fad6c6752ca07a274632202710";
+ sha256 = "0zww9975x8wkmcdxzg4b51v94iy9644lb1miaz9ra2nwzz4ljqzj";
};
meta.homepage = "https://github.com/wbthomason/packer.nvim/";
};
@@ -4429,12 +4441,13 @@ final: prev:
sideways-vim = buildVimPluginFrom2Nix {
pname = "sideways-vim";
- version = "2021-06-06";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "sideways.vim";
- rev = "15acde01892efd6e8d2a5c452babe862ce05f74d";
- sha256 = "0bb06g2knzqj7himsvpfydq8yig2szz9q5pqds9yv83m3vh4kppl";
+ rev = "bf19ffb2ea583516908ceb861e7c52a0c3260221";
+ sha256 = "1mrqli7gpn3bzfjn3095ms9m8vkpf7zlia6m75c0ppxgmyry8ngs";
+ fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/sideways.vim/";
};
@@ -4501,12 +4514,12 @@ final: prev:
sonokai = buildVimPluginFrom2Nix {
pname = "sonokai";
- version = "2021-06-01";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "sainnhe";
repo = "sonokai";
- rev = "9dd432b1bce0bd448faf22375fcf6311ff0d4226";
- sha256 = "0asqmnyizcyg5drfhbm52l654q3s5ibvbnd8n45kbcn3cnaqb148";
+ rev = "5c1fc0452387cae323692e3345238a780a942056";
+ sha256 = "0j2bba7img06m6b7lzgw1q5r8g38cs70pynwisqdb34l5jbj0fqx";
};
meta.homepage = "https://github.com/sainnhe/sonokai/";
};
@@ -4609,12 +4622,12 @@ final: prev:
splitjoin-vim = buildVimPluginFrom2Nix {
pname = "splitjoin-vim";
- version = "2021-04-24";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "AndrewRadev";
repo = "splitjoin.vim";
- rev = "f4773c0d2f7453fea23f5f69f433547f3d62ea0a";
- sha256 = "06fsfsvrq6sqyqpmj693vn810c6zvzn16781mw6bb2912cmyrs5z";
+ rev = "a8c4af3d69839cd2c03d458044fb3d3b128e450d";
+ sha256 = "0s87vzdb3j3hna5yda4jay1k4zw419mqd8yn3h4q22qhhsr36q0k";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -5116,12 +5129,12 @@ final: prev:
ultisnips = buildVimPluginFrom2Nix {
pname = "ultisnips";
- version = "2021-05-18";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "SirVer";
repo = "ultisnips";
- rev = "b3fd9022bdc3472dac114a8b2aa85b845189514b";
- sha256 = "0yss85xy3i6gfgpwy3h42db5q5gpmv9m3s64ygfix5f24lflsi98";
+ rev = "b6c9a814a4fdfcad3ea53d8888746803a7218a9e";
+ sha256 = "0iqirp8pmsrgrk3i0hkk1a66igc5ydi96scp62yl97nazhz45xxr";
};
meta.homepage = "https://github.com/SirVer/ultisnips/";
};
@@ -5464,12 +5477,12 @@ final: prev:
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2021-06-04";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "82b1b2e87677b468a3b6140372839654d8c346e7";
- sha256 = "0vvaj84q72z5b473f4823laxdvqb1qqj83n05ixavzpjq2qnlmhq";
+ rev = "49cdcb7b3ea76ee19c737885c0ab19e64e564169";
+ sha256 = "17p0j9i6ylns66cx6qw4266yd6al1gvmran3k4v2mhjlynf5c4s3";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -5560,12 +5573,12 @@ final: prev:
vim-autoformat = buildVimPluginFrom2Nix {
pname = "vim-autoformat";
- version = "2021-06-05";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "vim-autoformat";
repo = "vim-autoformat";
- rev = "31e47bb9ee7a8b7aa2d324723dac75ea02896044";
- sha256 = "1pw5iipr6yln1nspy2sn13cx7p1cn5485l8rkkkyqfwqgqsj3jfq";
+ rev = "43ec20e20f21f4f4a5eccadef01186ee7bf1df98";
+ sha256 = "0qa9a6l9snkvnf41924mvv5yhm8ywcz6mzdirsr43inp5hgv6r8n";
};
meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";
};
@@ -5740,12 +5753,12 @@ final: prev:
vim-clap = buildVimPluginFrom2Nix {
pname = "vim-clap";
- version = "2021-06-06";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
- rev = "351ec86836986fb36e48ba414d65b62a7793374a";
- sha256 = "1gksn9s40fjzwp6v0cmss2mxhpprj8ycysy5rbfp8h3vdghkkya7";
+ rev = "c7e013cb273597e37eb65b481cbeb7d1b92b01b7";
+ sha256 = "1i33y3jqjqbrg2mgnz4sxvsckl1ggdg3aymxxz4l3qivnbn1fni5";
};
meta.homepage = "https://github.com/liuchengxu/vim-clap/";
};
@@ -6580,12 +6593,12 @@ final: prev:
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2021-06-03";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "68a8cb300c75eb1cd2173b2aac70515e99904ef3";
- sha256 = "0s4c1vb2z3manl2i768f48i2pww2d4dj41plx4mvvi7sczlma30n";
+ rev = "0f98634b92da9a35580b618c11a6d2adc42d9f90";
+ sha256 = "0l1f98zfmxq8xi2ii31ih0mbq5yilpc0l61qbprs1g5h5p4azjy8";
};
meta.homepage = "https://github.com/airblade/vim-gitgutter/";
};
@@ -7326,12 +7339,12 @@ final: prev:
vim-lsp = buildVimPluginFrom2Nix {
pname = "vim-lsp";
- version = "2021-06-02";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "prabirshrestha";
repo = "vim-lsp";
- rev = "ddd5abb5b6491117c4b7ef4149e47945926eecd8";
- sha256 = "0xv687xzwqhwpmxr65sm3ln74y8mxww1q3fqj57va06ilxzac56c";
+ rev = "516fd7ce956bdfa2fa6ee8ac6d77ad8a57616811";
+ sha256 = "0anfwxq93ddmymdna692xz74h3kimwmw1ii6pq8ci08i3pkqjrf7";
};
meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
};
@@ -8095,12 +8108,12 @@ final: prev:
vim-qf = buildVimPluginFrom2Nix {
pname = "vim-qf";
- version = "2021-03-29";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "romainl";
repo = "vim-qf";
- rev = "127257057c4befb8c1026a7ba7e07713af1fb5c8";
- sha256 = "1ai915kfxq4m8ba304qpcc2qb5rcj2vsrfcdh3blb1slw3a90hiq";
+ rev = "4fe7e33a514874692d6897edd1acaaa46d9fb646";
+ sha256 = "054p9f3a3yljng3r51asgyq2ifmmrr35ws5f8dv8ssmby2f7an1l";
};
meta.homepage = "https://github.com/romainl/vim-qf/";
};
@@ -8203,12 +8216,12 @@ final: prev:
vim-rooter = buildVimPluginFrom2Nix {
pname = "vim-rooter";
- version = "2021-04-12";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-rooter";
- rev = "662c00676abab9d7ce16bf9f202420bf86cc6554";
- sha256 = "1birkzysn8midk627zyp3pla51wmz4sp613gs5xxlms5imq4diaq";
+ rev = "9a5ce8edc67cca36cc530ee27a805112ce7a7e9b";
+ sha256 = "0zx1mzaiqwqyg7imahwy0mzp52b2dzp4qdnrsgcnkvkxf8v67bak";
};
meta.homepage = "https://github.com/airblade/vim-rooter/";
};
@@ -8467,12 +8480,12 @@ final: prev:
vim-smt2 = buildVimPluginFrom2Nix {
pname = "vim-smt2";
- version = "2021-02-16";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "bohlender";
repo = "vim-smt2";
- rev = "196d05f7152fb95c4613476368ebae9dd842d470";
- sha256 = "0lk9clnvrkjbxgszg52zdl28d313vk2fiyh86aa6xx5pr0nr9iw3";
+ rev = "2cc8c80c0a88e0d47de85bef1d50df86e197c302";
+ sha256 = "0djk8s8q4b72blw73r4m7z9gc15gys167xgnvd1avmfyfw8fb22a";
};
meta.homepage = "https://github.com/bohlender/vim-smt2/";
};
@@ -8972,12 +8985,12 @@ final: prev:
vim-ultest = buildVimPluginFrom2Nix {
pname = "vim-ultest";
- version = "2021-06-04";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "rcarriga";
repo = "vim-ultest";
- rev = "17e372f83238d5d85f6574c59d5d210a898e8623";
- sha256 = "084mn6zxc2x8gp938fpi5ylwqy2pgvn046xbsmyq8md36vqb6m7g";
+ rev = "d864a6b2b0f394b9371246cad226adac7507e13d";
+ sha256 = "0bvdhbla38mvq9x595h5mcvib13sb84mz3z9f7sqf4m3c9v9376m";
};
meta.homepage = "https://github.com/rcarriga/vim-ultest/";
};
@@ -9200,12 +9213,12 @@ final: prev:
vim-xtabline = buildVimPluginFrom2Nix {
pname = "vim-xtabline";
- version = "2021-05-29";
+ version = "2021-06-08";
src = fetchFromGitHub {
owner = "mg979";
repo = "vim-xtabline";
- rev = "ad80aa67958a31a254d8994c7a517c1123256721";
- sha256 = "07pd7wzyvch400i6kv0ld3bx2x90ycdjaapwc7aaqkwikk2slq3h";
+ rev = "5e67677a4815bbf474b52f8aefcfa2090fe43768";
+ sha256 = "17pb39zhzsmmibxmsbrsd3znky88sar2sl0h7b1418qqkaakx4p9";
};
meta.homepage = "https://github.com/mg979/vim-xtabline/";
};
@@ -9392,12 +9405,12 @@ final: prev:
vimspector = buildVimPluginFrom2Nix {
pname = "vimspector";
- version = "2021-05-25";
+ version = "2021-06-07";
src = fetchFromGitHub {
owner = "puremourning";
repo = "vimspector";
- rev = "a51b8b23c9b7e12c2899e423037458d46dbe196e";
- sha256 = "0w49lgmg880pzblwwkkrp24pyvd8dkjbqvsx9m6n3x5n4zmz1c1f";
+ rev = "1cbb400d426760a63d5383e2574e9d8905bebe51";
+ sha256 = "172kryvxphsvbh2f60ka21rjsrq4abgdh1ijyxp57p1qbbv9fhcc";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -9405,12 +9418,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2021-06-01";
+ version = "2021-06-06";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "b0d430b80504e847584664d83e879399647cd38f";
- sha256 = "0k44iv5fig0601bc1vglgbphiw0h6gq8379zsk1ca3fgzyi2ic0p";
+ rev = "fef77c8edf655d947e4d9c78d7bd2740ccda70cd";
+ sha256 = "06hdz4rwwnmm1hhhjhvcd50r04qnvmksriaw4csv3gfnkfkm5v9r";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 1a2457d36d37..015504c5b45d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -159,6 +159,7 @@ GEverding/vim-hocon
gfanto/fzf-lsp.nvim@main
gibiansky/vim-textobj-haskell
gioele/vim-autoswap
+gleam-lang/gleam.vim
glepnir/dashboard-nvim
glepnir/galaxyline.nvim@main
glepnir/lspsaga.nvim@main
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 1ca566bf7f27..1d6ba18200d6 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -615,7 +615,7 @@ let
};
};
- JakeBecker.elixir-ls = buildVscodeMarketplaceExtension {
+ jakebecker.elixir-ls = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "elixir-ls";
publisher = "JakeBecker";
@@ -1173,7 +1173,7 @@ let
};
};
- VSpaceCode.vspacecode = buildVscodeMarketplaceExtension {
+ vspacecode.vspacecode = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vspacecode";
publisher = "VSpaceCode";
@@ -1185,7 +1185,7 @@ let
};
};
- VSpaceCode.whichkey = buildVscodeMarketplaceExtension {
+ vspacecode.whichkey = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "whichkey";
publisher = "VSpaceCode";
diff --git a/pkgs/os-specific/linux/alsa-plugins/wrapper.nix b/pkgs/os-specific/linux/alsa-plugins/wrapper.nix
deleted file mode 100644
index 8271088a5016..000000000000
--- a/pkgs/os-specific/linux/alsa-plugins/wrapper.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ writeShellScriptBin, stdenv, alsaPlugins }:
-writeShellScriptBin "ap${if stdenv.hostPlatform.system == "i686-linux" then "32" else "64"}" ''
- ALSA_PLUGIN_DIRS=${alsaPlugins}/lib/alsa-lib "$@"
-''
diff --git a/pkgs/os-specific/linux/alsa-firmware/cross.patch b/pkgs/os-specific/linux/alsa-project/alsa-firmware/cross.patch
similarity index 100%
rename from pkgs/os-specific/linux/alsa-firmware/cross.patch
rename to pkgs/os-specific/linux/alsa-project/alsa-firmware/cross.patch
diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix
similarity index 62%
rename from pkgs/os-specific/linux/alsa-firmware/default.nix
rename to pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix
index a627a7762a89..8f53eefb1fdf 100644
--- a/pkgs/os-specific/linux/alsa-firmware/default.nix
+++ b/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix
@@ -1,18 +1,14 @@
-{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }:
+{ lib, stdenv, buildPackages, autoreconfHook, fetchurl }:
stdenv.mkDerivation rec {
- name = "alsa-firmware-1.2.1";
+ pname = "alsa-firmware";
+ version = "1.2.4";
src = fetchurl {
- url = "mirror://alsa/firmware/${name}.tar.bz2";
- sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf";
+ url = "mirror://alsa/firmware/${pname}-${version}.tar.bz2";
+ sha256 = "1fymdjrsbndws3gy4ypm7id31261k65bh2pzyrz29z5w11ynsyxn";
};
- patches = [ (fetchpatch {
- url = "https://github.com/alsa-project/alsa-firmware/commit/a8a478485a999ff9e4a8d8098107d3b946b70288.patch";
- sha256 = "0zd7vrgz00hn02va5bkv7qj2395a1rl6f8jq1mwbryxs7hiysb78";
- }) ];
-
nativeBuildInputs = [ autoreconfHook buildPackages.stdenv.cc ];
configureFlags = [
diff --git a/pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch b/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch
similarity index 100%
rename from pkgs/os-specific/linux/alsa-lib/alsa-plugin-conf-multilib.patch
rename to pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch
diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix
similarity index 100%
rename from pkgs/os-specific/linux/alsa-lib/default.nix
rename to pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix
diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix
similarity index 86%
rename from pkgs/os-specific/linux/alsa-oss/default.nix
rename to pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix
index 9c87dbe8e8c8..f600b52c5f3a 100644
--- a/pkgs/os-specific/linux/alsa-oss/default.nix
+++ b/pkgs/os-specific/linux/alsa-project/alsa-oss/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:
+{lib, stdenv, fetchurl, alsa-lib, gettext, ncurses, libsamplerate}:
stdenv.mkDerivation rec {
pname = "alsa-oss";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "13nn6n6wpr2sj1hyqx4r9nb9bwxnhnzw8r2f08p8v13yjbswxbb4";
};
- buildInputs = [ alsaLib ncurses libsamplerate ];
+ buildInputs = [ alsa-lib ncurses libsamplerate ];
nativeBuildInputs = [ gettext ];
configureFlags = [ "--disable-xmlto" ];
diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix
similarity index 84%
rename from pkgs/os-specific/linux/alsa-plugins/default.nix
rename to pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix
index 09dbdbc9b6fb..684ecc236888 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-project/alsa-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, pkg-config, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }:
+{ stdenv, fetchurl, lib, pkg-config, alsa-lib, libogg, libpulseaudio ? null, libjack2 ? null }:
stdenv.mkDerivation rec {
pname = "alsa-plugins";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
# ToDo: a52, etc.?
buildInputs =
- [ alsaLib libogg ]
+ [ alsa-lib libogg ]
++ lib.optional (libpulseaudio != null) libpulseaudio
++ lib.optional (libjack2 != null) libjack2;
diff --git a/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix b/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix
new file mode 100644
index 000000000000..992f4886e262
--- /dev/null
+++ b/pkgs/os-specific/linux/alsa-project/alsa-plugins/wrapper.nix
@@ -0,0 +1,10 @@
+{ stdenv
+, alsa-plugins
+, writeShellScriptBin
+}:
+let
+ arch = if stdenv.hostPlatform.system == "i686-linux" then "32" else "64";
+in
+writeShellScriptBin "ap${arch}" ''
+ ALSA_PLUGIN_DIRS=${alsa-plugins}/lib/alsa-lib "$@"
+''
diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix
similarity index 93%
rename from pkgs/os-specific/linux/alsa-tools/default.nix
rename to pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix
index 897d8dd6c02b..8b9abb74036b 100644
--- a/pkgs/os-specific/linux/alsa-tools/default.nix
+++ b/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, pkg-config, gtk2, gtk3, fltk13 }:
+{ lib, stdenv, fetchurl, alsa-lib, pkg-config, gtk2, gtk3, fltk13 }:
# Comes from upstream as as bundle of several tools,
# some use gtk2, some gtk3 (and some even fltk13).
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsaLib gtk2 gtk3 fltk13 ];
+ buildInputs = [ alsa-lib gtk2 gtk3 fltk13 ];
patchPhase = ''
export tools="as10k1 hda-verb hdspmixer echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control"
diff --git a/pkgs/os-specific/linux/alsa-topology-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix
similarity index 100%
rename from pkgs/os-specific/linux/alsa-topology-conf/default.nix
rename to pkgs/os-specific/linux/alsa-project/alsa-topology-conf/default.nix
diff --git a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix
similarity index 100%
rename from pkgs/os-specific/linux/alsa-ucm-conf/default.nix
rename to pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix
similarity index 85%
rename from pkgs/os-specific/linux/alsa-utils/default.nix
rename to pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix
index dd747bbbf6fc..ae2a9f21a6d6 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, alsaLib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}:
+{lib, stdenv, fetchurl, alsa-lib, gettext, makeWrapper, ncurses, libsamplerate, pciutils, which, fftw}:
stdenv.mkDerivation rec {
pname = "alsa-utils";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ gettext makeWrapper ];
- buildInputs = [ alsaLib ncurses libsamplerate fftw ];
+ buildInputs = [ alsa-lib ncurses libsamplerate fftw ];
configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ];
diff --git a/pkgs/os-specific/linux/aseq2json/default.nix b/pkgs/os-specific/linux/aseq2json/default.nix
index 015419ee07a6..646e9f7b7b91 100644
--- a/pkgs/os-specific/linux/aseq2json/default.nix
+++ b/pkgs/os-specific/linux/aseq2json/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkg-config, alsaLib, glib, json-glib }:
+{ stdenv, lib, fetchFromGitHub, pkg-config, alsa-lib, glib, json-glib }:
stdenv.mkDerivation {
pname = "aseq2json";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sourceRoot = "source/aseq2json";
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsaLib glib json-glib ];
+ buildInputs = [ alsa-lib glib json-glib ];
installPhase = ''
install -D --target-directory "$out/bin" aseq2json
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index 2e342fbc0392..f995c8c5c1e2 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -1,7 +1,7 @@
{ stdenv
, lib
, fetchurl
-, alsaLib
+, alsa-lib
, dbus
, glib
, json_c
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
};
buildInputs = [
- alsaLib
+ alsa-lib
dbus
glib
json_c
diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix
index c241ac02a649..04eccaf02435 100644
--- a/pkgs/os-specific/linux/guvcview/default.nix
+++ b/pkgs/os-specific/linux/guvcview/default.nix
@@ -9,7 +9,7 @@
, udev
, libusb1
, libv4l
-, alsaLib
+, alsa-lib
, gsl
, libpng
, sfml
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
buildInputs = [
SDL2
- alsaLib
+ alsa-lib
ffmpeg
libusb1
libv4l
diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix
index e97dcad43db0..ca5b82b87858 100644
--- a/pkgs/os-specific/linux/mwprocapture/default.nix
+++ b/pkgs/os-specific/linux/mwprocapture/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, kernel, alsaLib }:
+{ lib, stdenv, fetchurl, kernel, alsa-lib }:
with lib;
@@ -7,7 +7,7 @@ let
if stdenv.is64bit then "64"
else "32";
- libpath = makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsaLib ];
+ libpath = makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsa-lib ];
in
stdenv.mkDerivation rec {
diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix
index 9e9cf149fefb..0797656f653e 100644
--- a/pkgs/os-specific/linux/pommed-light/default.nix
+++ b/pkgs/os-specific/linux/pommed-light/default.nix
@@ -2,7 +2,7 @@
, fetchFromGitHub
, pciutils
, libconfuse
-, alsaLib
+, alsa-lib
, audiofile
, pkg-config
, zlib
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pciutils
libconfuse
- alsaLib
+ alsa-lib
audiofile
zlib
eject
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 81a5f74c42fc..90a052fdef9d 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, pkg-config, perl
, libjpeg, udev
, withUtils ? true
-, withGUI ? true, alsaLib, libX11, qtbase, libGLU, wrapQtAppsHook
+, withGUI ? true, alsa-lib, libX11, qtbase, libGLU, wrapQtAppsHook
}:
# See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT)
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config perl ] ++ lib.optional withQt wrapQtAppsHook;
- buildInputs = [ udev ] ++ lib.optionals withQt [ alsaLib libX11 qtbase libGLU ];
+ buildInputs = [ udev ] ++ lib.optionals withQt [ alsa-lib libX11 qtbase libGLU ];
propagatedBuildInputs = [ libjpeg ];
diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix
index 4be2bdfb5b86..1ff50079ebd7 100644
--- a/pkgs/servers/gonic/default.nix
+++ b/pkgs/servers/gonic/default.nix
@@ -1,5 +1,5 @@
{ lib, buildGoModule, fetchFromGitHub
-, pkg-config, taglib, alsaLib
+, pkg-config, taglib, alsa-lib
, zlib
# Disable on-the-fly transcoding,
@@ -21,7 +21,7 @@ buildGoModule rec {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ taglib alsaLib zlib ];
+ buildInputs = [ taglib alsa-lib zlib ];
vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9";
# TODO(Profpatsch): write a test for transcoding support,
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 56bf0ed5d2ff..86c150991f77 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -11,7 +11,7 @@
# Filters
, libsamplerate
# Outputs
-, alsaLib, libjack2, libpulseaudio, libshout
+, alsa-lib, libjack2, libpulseaudio, libshout
# Misc
, icu, sqlite, avahi, dbus, pcre, libgcrypt, expat
# Services
@@ -63,7 +63,7 @@ let
# Filter plugins
libsamplerate = [ libsamplerate ];
# Output plugins
- alsa = [ alsaLib ];
+ alsa = [ alsa-lib ];
jack = [ libjack2 ];
pulse = [ libpulseaudio ];
shout = [ libshout ];
diff --git a/pkgs/servers/mumsi/default.nix b/pkgs/servers/mumsi/default.nix
index b4d1fda40901..c6fd2332c90c 100644
--- a/pkgs/servers/mumsi/default.nix
+++ b/pkgs/servers/mumsi/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, boost
-, log4cpp, pjsip, openssl, alsaLib, mumlib }:
+, log4cpp, pjsip, openssl, alsa-lib, mumlib }:
with lib; stdenv.mkDerivation {
pname = "mumsi";
version = "unstable-2018-12-12";
@@ -11,7 +11,7 @@ with lib; stdenv.mkDerivation {
sha256 = "0vrivl1fiiwjsz4v26nrn8ra3k9v0mcz7zjm2z319fw8hv6n1nrk";
};
- buildInputs = [ boost log4cpp pkg-config pjsip mumlib openssl alsaLib ];
+ buildInputs = [ boost log4cpp pkg-config pjsip mumlib openssl alsa-lib ];
nativeBuildInputs = [ cmake pkg-config ];
installPhase = ''
install -Dm555 mumsi $out/bin/mumsi
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index bebe4801c65e..10b18dd1ae1d 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, autoreconfHook
, libsndfile, libtool, makeWrapper, perlPackages
-, xorg, libcap, alsaLib, glib, dconf
+, xorg, libcap, alsa-lib, glib, dconf
, avahi, libjack2, libasyncns, lirc, dbus
, sbc, bluez5, udev, openssl, fftwFloat
, soxr, speexdsp, systemd, webrtc-audio-processing
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
++ lib.optional jackaudioSupport libjack2
++ lib.optionals x11Support [ xorg.xlibsWrapper xorg.libXtst xorg.libXi ]
++ lib.optional useSystemd systemd
- ++ lib.optionals stdenv.isLinux [ alsaLib udev ]
+ ++ lib.optionals stdenv.isLinux [ alsa-lib udev ]
++ lib.optional airtunesSupport openssl
++ lib.optionals bluetoothSupport [ bluez5 sbc ]
++ lib.optional remoteControlSupport lirc
diff --git a/pkgs/servers/pulseaudio/pali.nix b/pkgs/servers/pulseaudio/pali.nix
index cc11f98a8290..b07c2fd4ac70 100644
--- a/pkgs/servers/pulseaudio/pali.nix
+++ b/pkgs/servers/pulseaudio/pali.nix
@@ -11,7 +11,7 @@
, perlPackages
, xorg
, libcap
-, alsaLib
+, alsa-lib
, glib
, dconf
, avahi
@@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
xorg.libXtst
xorg.xlibsWrapper
] ++ lib.optionals stdenv.isLinux [
- alsaLib
+ alsa-lib
systemd
udev
] ++ lib.optional airtunesSupport openssl
diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix
index 3fcb8af65e29..c26ae1e6416c 100644
--- a/pkgs/servers/roon-server/default.nix
+++ b/pkgs/servers/roon-server/default.nix
@@ -1,5 +1,5 @@
-{ alsaLib
-, alsaUtils
+{ alsa-lib
+, alsa-utils
, autoPatchelfHook
, cifs-utils
, fetchurl
@@ -23,8 +23,8 @@
};
buildInputs = [
- alsaLib
- alsaUtils
+ alsa-lib
+ alsa-utils
cifs-utils
ffmpeg
freetype
@@ -48,7 +48,7 @@
ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin}
'';
wrapFix = bin: ''
- wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsaUtils cifs-utils ffmpeg ]}
+ wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsa-utils cifs-utils ffmpeg ]}
'';
in
''
diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index bae2f3aad79d..7fdb4bbc8693 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsaLib
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsa-lib
, libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }:
stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [
openssl
avahi
- alsaLib
+ alsa-lib
libdaemon
popt
libconfig
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index be3b4209eb9e..cc80acd42265 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tailscale";
- version = "1.8.6";
+ version = "1.8.7";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
- sha256 = "1h3ry4y62wwcv4z3yjqal4ch4xy40k9s3rq20lqs3r58kblnaxs2";
+ sha256 = "0mw0sizy30slgyd06syd9sqx22dxd08ncqx7srcinj1g7hxylm5z";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/tools/audio/alsaequal/default.nix
index 12d590c4c762..c6c25fd39966 100644
--- a/pkgs/tools/audio/alsaequal/default.nix
+++ b/pkgs/tools/audio/alsaequal/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl
-, alsaLib, caps
+, alsa-lib, caps
}:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1w3g9q5z3nrn3mwdhaq6zsg0jila8d102dgwgrhj9vfx58apsvli";
};
- buildInputs = [ alsaLib ];
+ buildInputs = [ alsa-lib ];
makeFlags = [ "DESTDIR=$(out)" ];
diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix
index f7d74dc615c8..1ff66e83e5a4 100644
--- a/pkgs/tools/audio/darkice/default.nix
+++ b/pkgs/tools/audio/darkice/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config
-, libjack2, alsaLib, libpulseaudio
+, libjack2, alsa-lib, libpulseaudio
, faac, lame, libogg, libopus, libvorbis, libsamplerate
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
- libopus libvorbis libogg libpulseaudio alsaLib libsamplerate libjack2 lame
+ libopus libvorbis libogg libpulseaudio alsa-lib libsamplerate libjack2 lame
];
NIX_CFLAGS_COMPILE = "-fpermissive";
diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
index 03ea3302d262..9ef8eb43772a 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }:
+{ lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }:
stdenv.mkDerivation {
name = "gvolicon-2014-04-28";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
- makeWrapper alsaLib gtk3 gdk-pixbuf gnome.adwaita-icon-theme
+ makeWrapper alsa-lib gtk3 gdk-pixbuf gnome.adwaita-icon-theme
librsvg wrapGAppsHook
];
diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix
index 3d05461121f0..1c52e6796b7b 100644
--- a/pkgs/tools/audio/liquidsoap/full.nix
+++ b/pkgs/tools/audio/liquidsoap/full.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, makeWrapper, fetchurl, which, pkg-config
, ocamlPackages
-, libao, portaudio, alsaLib, libpulseaudio, libjack2
+, libao, portaudio, alsa-lib, libpulseaudio, libjack2
, libsamplerate, libmad, taglib, lame, libogg
, libvorbis, speex, libtheora, libopus, zlib
, faad2, flac, ladspaH, ffmpeg, frei0r, dssi
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs =
[ which ocamlPackages.ocaml ocamlPackages.findlib
- libao portaudio alsaLib libpulseaudio libjack2
+ libao portaudio alsa-lib libpulseaudio libjack2
libsamplerate libmad taglib lame libogg
libvorbis speex libtheora libopus zlib
faad2 flac ladspaH ffmpeg frei0r dssi
diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix
index 186f67f35042..f220fed208f1 100644
--- a/pkgs/tools/audio/mididings/default.nix
+++ b/pkgs/tools/audio/mididings/default.nix
@@ -1,4 +1,4 @@
-{ lib, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }:
+{ lib, pythonPackages, fetchFromGitHub, pkg-config, glib, alsa-lib, libjack2 }:
pythonPackages.buildPythonApplication {
version = "2015-11-17";
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ glib alsaLib libjack2 pythonPackages.boost ];
+ buildInputs = [ glib alsa-lib libjack2 pythonPackages.boost ];
propagatedBuildInputs = with pythonPackages; [ decorator ]
# for livedings
++ [ tkinter pyliblo ]
diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix
index 0c82d09f99bf..13f8dde680dd 100644
--- a/pkgs/tools/audio/opl3bankeditor/default.nix
+++ b/pkgs/tools/audio/opl3bankeditor/default.nix
@@ -1,4 +1,4 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }:
+{ lib, mkDerivation, fetchFromGitHub, cmake, qttools, alsa-lib }:
mkDerivation rec {
version = "1.5.1";
@@ -13,7 +13,7 @@ mkDerivation rec {
};
buildInputs = [
- alsaLib qttools
+ alsa-lib qttools
];
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix
index 3aca8e8f6193..da4654a3e5fc 100644
--- a/pkgs/tools/audio/pnmixer/default.nix
+++ b/pkgs/tools/audio/pnmixer/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext, alsaLib, gtk3, glib, libnotify, libX11, pcre }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext, alsa-lib, gtk3, glib, libnotify, libX11, pcre }:
stdenv.mkDerivation rec {
pname = "pnmixer";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config gettext ];
- buildInputs = [ alsaLib gtk3 glib libnotify libX11 pcre ];
+ buildInputs = [ alsa-lib gtk3 glib libnotify libX11 pcre ];
meta = with lib; {
homepage = "https://github.com/nicklan/pnmixer";
diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix
index 55dbba007f87..f8b705a8fa15 100644
--- a/pkgs/tools/audio/qastools/default.nix
+++ b/pkgs/tools/audio/qastools/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitLab, cmake, alsaLib, udev, qtbase, qtsvg, qttools }:
+{ mkDerivation, lib, fetchFromGitLab, cmake, alsa-lib, udev, qtbase, qtsvg, qttools }:
mkDerivation rec {
pname = "qastools";
@@ -12,7 +12,7 @@ mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ alsaLib udev qtbase qtsvg qttools ];
+ buildInputs = [ alsa-lib udev qtbase qtsvg qttools ];
meta = with lib; {
description = "Collection of desktop applications for ALSA configuration";
diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix
index c7445f03fd37..b3ffee6419bf 100644
--- a/pkgs/tools/audio/trx/default.nix
+++ b/pkgs/tools/audio/trx/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, libopus, ortp, bctoolbox }:
+{ lib, stdenv, fetchurl, alsa-lib, libopus, ortp, bctoolbox }:
stdenv.mkDerivation rec {
pname = "trx";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
./add_bctoolbox_ldlib.patch
];
- buildInputs = [ alsaLib libopus ortp bctoolbox ];
+ buildInputs = [ alsa-lib libopus ortp bctoolbox ];
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix
index 79dc5a356be9..4d726cbd2a9e 100644
--- a/pkgs/tools/audio/volumeicon/default.nix
+++ b/pkgs/tools/audio/volumeicon/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, fetchurl, lib, stdenv, gtk3, pkg-config, intltool, alsaLib }:
+{ pkgs, fetchurl, lib, stdenv, gtk3, pkg-config, intltool, alsa-lib }:
stdenv.mkDerivation {
pname = "volumeicon";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ gtk3 intltool alsaLib ];
+ buildInputs = [ gtk3 intltool alsa-lib ];
meta = with lib; {
description = "A lightweight volume control that sits in your systray";
diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix
index 6867d7c8ce94..175fa92bad2f 100644
--- a/pkgs/tools/bluetooth/bluez-alsa/default.nix
+++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook
-, alsaLib, bluez, glib, sbc, dbus
+, alsa-lib, bluez, glib, sbc, dbus
# optional, but useful utils
, readline, libbsd, ncurses
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [
- alsaLib bluez glib sbc dbus
+ alsa-lib bluez glib sbc dbus
readline libbsd ncurses
]
++ optional aacSupport fdk_aac;
diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix
index c3bdbca7a591..fef13a893728 100644
--- a/pkgs/tools/misc/brltty/default.nix
+++ b/pkgs/tools/misc/brltty/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, python3, bluez
, tcl, acl, kmod, coreutils, shadow, util-linux, udev
-, alsaSupport ? stdenv.isLinux, alsaLib
+, alsaSupport ? stdenv.isLinux, alsa-lib
, systemdSupport ? stdenv.isLinux, systemd
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config python3.pkgs.cython tcl ];
buildInputs = [ bluez ]
- ++ lib.optional alsaSupport alsaLib
+ ++ lib.optional alsaSupport alsa-lib
++ lib.optional systemdSupport systemd;
meta = {
diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix
index 8ede05104874..8baeb1556b14 100644
--- a/pkgs/tools/misc/mongodb-compass/default.nix
+++ b/pkgs/tools/misc/mongodb-compass/default.nix
@@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl, dpkg
-, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
+, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
, gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }:
let
version = "1.25.0";
rpath = lib.makeLibraryPath [
- alsaLib
+ alsa-lib
at-spi2-atk
at-spi2-core
atk
diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index db3a065fdf4e..847e8bb84282 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -1,11 +1,11 @@
{ stdenv, lib, fetchurl, makeWrapper
, dpkg, patchelf
-, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd
+, gtk2, glib, gdk-pixbuf, alsa-lib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd
, libXdamage, expat }:
let
LD_LIBRARY_PATH = lib.makeLibraryPath
- [ glib gtk2 gdk-pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ];
+ [ glib gtk2 gdk-pixbuf alsa-lib nss nspr GConf cups libgcrypt dbus libXdamage expat ];
in
stdenv.mkDerivation rec {
version = "2.8.1";
diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix
index 78172c5ef75d..f611b7adc07c 100644
--- a/pkgs/tools/misc/sutils/default.nix
+++ b/pkgs/tools/misc/sutils/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, alsaLib }:
+{ lib, stdenv, fetchFromGitHub, alsa-lib }:
stdenv.mkDerivation rec {
version = "0.2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- buildInputs = [ alsaLib ];
+ buildInputs = [ alsa-lib ];
prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix
index 12168bd07f06..1ead06ed6e85 100644
--- a/pkgs/tools/misc/sweep-visualizer/default.nix
+++ b/pkgs/tools/misc/sweep-visualizer/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, makeWrapper, fetchurl,
- alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib,
+ alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib,
gnome2, pango, gtk2-x11, nspr, nss,
libX11, libxcb, libXcomposite, libXcursor, libXdamage, libXext, libXfixes,
libXi, libXrandr, libXrender, libXScrnSaver, libXtst,
@@ -32,7 +32,7 @@
preFixup = let
libPath = lib.makeLibraryPath [
- alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype
+ alsa-lib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype
gdk-pixbuf glib gnome2.GConf pango gtk2-x11 nspr nss stdenv.cc.cc.lib
libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes
libXi libXrandr libXrender libXScrnSaver libXtst
diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index 63c4fd36ff6e..760284140b11 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, alsaLib, libjack2, ncurses, pkg-config }:
+{ lib, stdenv, fetchurl, alsa-lib, libjack2, ncurses, pkg-config }:
stdenv.mkDerivation {
name = "timidity-2.15.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
patches = [ ./timidity-iA-Oj.patch ];
nativeBuildInputs = [ pkg-config ];
- buildInputs = [ alsaLib libjack2 ncurses ];
+ buildInputs = [ alsa-lib libjack2 ncurses ];
configureFlags = [ "--enable-audio=oss,alsa,jack" "--enable-alsaseq" "--with-default-output=alsa" "--enable-ncurses" ];
diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix
index e1a5de7754e7..92d783dd5fdf 100644
--- a/pkgs/tools/security/encryptr/default.nix
+++ b/pkgs/tools/security/encryptr/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype
, pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes
-, libXrender, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr
+, libXrender, libXcomposite , alsa-lib, libXdamage, libXtst, libXrandr
, expat, libcap, systemd , dbus, gtk2 , gdk-pixbuf, libnotify
}:
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
rpath = lib.makeLibraryPath [
glib nss nspr gconf fontconfig freetype pango cairo libX11 libXi
- libXcursor libXext libXfixes libXrender libXcomposite alsaLib
+ libXcursor libXext libXfixes libXrender libXcomposite alsa-lib
libXdamage libXtst libXrandr expat libcap dbus gtk2 gdk-pixbuf
libnotify stdenv.cc.cc
];
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 8894a77a86a4..3032c18427ad 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, alsaLib, atk, cairo, cups, udev, libdrm, mesa
+{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, udev, libdrm, mesa
, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libappindicator-gtk3
, libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook
, runtimeShell, gsettings-desktop-schemas }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- alsaLib
+ alsa-lib
atk
cairo
cups
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 08d8ed9494f3..3eb72cefa122 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -40,8 +40,14 @@ mapAliases ({
adobe_flex_sdk = apache-flex-sdk; # added 2018-06-01
ag = silver-searcher; # added 2018-04-25
aircrackng = aircrack-ng; # added 2016-01-14
- alienfx = throw "alienfx has been removed."; # added 2019-12-08
aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30
+ alienfx = throw "alienfx has been removed."; # added 2019-12-08
+ alsaLib = alsa-lib; # added 2021-06-09
+ alsaOss = alsa-oss; # added 2021-06-10
+ alsaPlugins = alsa-plugins; # added 2021-06-10
+ alsaPluginWrapper = alsa-plugins-wrapper; # added 2021-06-10
+ alsaTools = alsa-tools; # added 2021-06-10
+ alsaUtils = alsa-utils; # added 2021-06-10
amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30
ammonite-repl = ammonite; # added 2017-05-02
amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ee12a25c44f..145b04e20ad7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20100,23 +20100,17 @@ in
alertmanager-irc-relay = callPackage ../servers/monitoring/alertmanager-irc-relay { };
- alsa-firmware = callPackage ../os-specific/linux/alsa-firmware { };
-
- alsaLib = callPackage ../os-specific/linux/alsa-lib { };
-
- alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { };
-
- alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { };
-
- alsaUtils = callPackage ../os-specific/linux/alsa-utils {
+ alsa-firmware = callPackage ../os-specific/linux/alsa-project/alsa-firmware { };
+ alsa-lib = callPackage ../os-specific/linux/alsa-project/alsa-lib { };
+ alsa-oss = callPackage ../os-specific/linux/alsa-project/alsa-oss { };
+ alsa-plugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { };
+ alsa-plugins-wrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { };
+ alsa-tools = callPackage ../os-specific/linux/alsa-project/alsa-tools { };
+ alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { };
+ alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { };
+ alsa-utils = callPackage ../os-specific/linux/alsa-project/alsa-utils {
fftw = fftwFloat;
};
- alsaOss = callPackage ../os-specific/linux/alsa-oss { };
- alsaTools = callPackage ../os-specific/linux/alsa-tools { };
-
- alsa-ucm-conf = callPackage ../os-specific/linux/alsa-ucm-conf { };
-
- alsa-topology-conf = callPackage ../os-specific/linux/alsa-topology-conf { };
inherit (callPackage ../misc/arm-trusted-firmware {})
buildArmTrustedFirmware
@@ -23348,7 +23342,7 @@ in
libXaw = xorg.libXaw;
Xaw3d = null;
gconf = null;
- alsaLib = null;
+ alsa-lib = null;
acl = null;
gpm = null;
inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO;