diff options
Diffstat (limited to 'pkgs/misc')
27 files changed, 55 insertions, 55 deletions
diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 085ad7902f5dd..95beb8bcdf3f8 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 2019820510efe..5e35dcaebd0f1 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 ff17833f690b6..03e97743905ba 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 1162791456038..8e08be28eda86 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 458b27d330441..4cb5ca9ec2e68 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 7cdd88d0b9410..f70e90e987220 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 c7bc7e9f976eb..8e10b7bb31542 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 1b00a55fe0586..e8feb1ea7ed50 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 e803a13068338..26abda81b3090 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 aaf736f3e5e4e..f76ddb78bd56f 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 502e5c647237a..e19b97a477ef4 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 d34a921e1773a..61d416e17ac8e 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 6e7e3bc6379cc..2e6aa683e4d3a 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 476ea7122cba4..13d2ea74f3424 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 68f48bc7b4039..0d2a5b117984b 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 8c0bc30d4384a..f9e8e4d69376f 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 7153c378f8a37..bddabede0a076 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 e6f1b4f1a7856..86ca803d965a7 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 8eab2f0572075..bf1dc1c95732b 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 11be67b6d9ea1..84837322e9715 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 75b86eaeebd12..803efe5149c24 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 7d63927e33f69..f8b9e5906f3e5 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 8553ab8364556..0023d9878b364 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 c2b8061485b54..1160a5fc1e7fa 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 865ab6ee1f31c..7474a304f0323 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 c1ccc668487af..aebe32497c1db 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 3b4c34702d3c5..9e4035801f1ed 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; |