diff options
Diffstat (limited to 'pkgs/development')
85 files changed, 194 insertions, 194 deletions
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index e304f67bd7546..f61d925036c0e 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 747de25142e5c..c8a1964814e52 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 27436d8b61431..5cab3b929f752 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 3a8fca2c1a05b..0d12d5fe2dfb7 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 eb3045d52ad6a..f3ca8a4f5bbbf 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 15238e63ecbd8..ef593422ff26b 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 33169be53026a..66aeff306e383 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 d3db493c5fe74..96a567895d6a3 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 3804999376edd..fae27b8ca754c 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 6430c9709362f..11333b1ef66a3 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 9a710ed6fa46d..99033e8738c5f 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 423c09d923a32..7a69038d5e0a7 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 306130a0991cc..228dbf9b14e92 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 e5da2bc3fe053..c36cbaa03f957 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 ca8f4106f3db1..713b32a349b44 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 eafe23c8e76df..a232b796a0682 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 b1655cd8b8fe5..6604ebbef82db 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 591f10b3be9d6..6fcdacf535b8a 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 cd1181877488d..81edb8b469a84 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 459821f253f55..2d65d3355cc7d 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 5249ccce0d9aa..77bda13f266c4 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 b7efc37ae0443..fc8d8f1652de0 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 b51bc3f7cdd89..bf76bc1e85708 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 f70a46e2f8edd..d02dac1f562fd 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 3143474112618..5cd6584f18fe2 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 9fefbe01ace0a..6abf632806a49 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/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index b1c6c6396c869..e1f2d326879c2 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 03048abcc3212..4f2f78f20cf00 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 ccfafd36a8a33..6c75b9866e897 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 45f5fcfe3a44d..afecd561b727d 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 88b1840955d32..54df6d7b25508 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 15fd9cd7286de..0a0f976e0dc49 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 fb0d6afc71057..ba3768227f329 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 9ce487b1b03a3..ca7ea10afffa9 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 dcd1388143da1..98d8ef434e069 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 7e4a6a0809876..d52abd4ab09fe 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 a80c317b06eef..cd8eb538462be 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 7e9095ef0edee..699f70a0788a5 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 99d38f0cfc43b..4a07ba9da7d89 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 0127c1ebe8a1a..5d4bca0f1b9f7 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 ec1a5ee382813..8f01958a9bcf3 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 a734a4b800928..02ccf0c66fb5e 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 fc577d7e50820..e9a54dc478cd7 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 ac9f3b2565463..2ef629e5467b9 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 004460abe3125..d9be4a2964f42 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 920315bb1bc24..dcf8990a879e2 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 6b7f0c102ee8f..b93cc96bde02f 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 452031dc92464..5d9cc98b1a9ca 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 43c781cf52cef..2d469a406dec9 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 ebdacdfc9bdbc..2c7dd440da828 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 1e686b980043d..276ad6b8c4923 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 b3e740f39c46c..40f4e328c3178 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 c7de116e879b5..efa68146e8d85 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 e9a868240bb3e..0151d461c1395 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 532a72c820ce0..ed93d86a19793 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 0af773947f04f..0d2d565fe7ae1 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 13ab7e35c5a4e..729c5f388f997 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 16f6c324a7a93..836bafd4280f1 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 4948e481ff581..41d776c68698f 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 c54b4a3721f62..8706b8789227e 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 0f16a519169f8..80034a5a9cf08 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 584b1e15a8e33..ff1f5eb8041a1 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 880823a84732b..81c1b51e65898 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 8915299a7349b..70fdf24dd9f4c 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 c8fce166aa7de..2746a60247bfe 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 4fafefd6f75de..0cb03746085af 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 c00c92a6c3334..88ef9f9efde89 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 c1f703f725156..498e5c4147277 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 a8e3236a3a031..a51366820a9d4 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/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix index a249b0aede131..e9cff7eb8243a 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/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index aadf75d59f7f8..781231749fdf5 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 4e6da0b8d4222..e1565fa6c30c7 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 948716a9b7cb8..4ab18efe332ae 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 568ce67d14345..838ffd4718405 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 d256b6e767a6b..25d61d2393e5e 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 3a210ab174f90..5e457227c8daf 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 475c08eb169fa..f5276510e6123 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 9cfb3c448e84e..7d0175ac912a6 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 ca8359a32a8c2..1db72dc1c8ff0 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 fcb1edf153ac2..cc46f3f5d3408 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 5c41a1dac931b..9333864c69b94 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 dc2f802211729..19cd15e7be41e 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 287709bbbad7f..9563563bc4270 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 1c854368df739..3ba900f3f6919 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 b8763c9432341..6eb7eb1b58c56 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 |