diff options
author | AndersonTorres <torres.anderson.85@protonmail.com> | 2021-06-09 23:57:09 -0300 |
---|---|---|
committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2021-06-10 01:12:49 -0300 |
commit | e9e5f5f84dedea81605e493ea6cec41275a9a8fd (patch) | |
tree | e84786baabde5e495f27b31a2d81fbe7b301f5ad /pkgs/games | |
parent | 7f7f2ef93a601eca84a0958f3b76d2b3f9db3391 (diff) |
Change all alsaLib references to alsa-lib
Diffstat (limited to 'pkgs/games')
26 files changed, 52 insertions, 52 deletions
diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index dc4f1f47f7b1..b40a608412ef 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU, libGL, alsaLib, libpulseaudio +{ lib, stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU, libGL, alsa-lib, libpulseaudio , xorg }: let @@ -6,7 +6,7 @@ let inherit (xorg) libXext libX11; lpath = "${stdenv.cc.cc.lib}/lib64:" + lib.makeLibraryPath [ - zlib libmad libpng12 libcaca libXext libX11 libGLU libGL alsaLib libpulseaudio]; + zlib libmad libpng12 libcaca libXext libX11 libGLU libGL alsa-lib libpulseaudio]; in stdenv.mkDerivation rec { diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index d648ac85c60e..61f5a5bf824d 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkg-config }: +{ lib, stdenv, fetchurl, amoeba-data, alsa-lib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkg-config }: stdenv.mkDerivation rec { name = "amoeba-${version}-${debver}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU xorg.libXxf86vm ]; + buildInputs = [ alsa-lib expat freetype gtk2 libvorbis libGLU xorg.libXxf86vm ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1/ diff --git a/pkgs/games/clonehero/default.nix b/pkgs/games/clonehero/default.nix index 377e1d79bdac..cf1fad8d945b 100644 --- a/pkgs/games/clonehero/default.nix +++ b/pkgs/games/clonehero/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , autoPatchelfHook -, alsaLib +, alsa-lib , gtk2 , libXrandr , libXScrnSaver @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { zlib # Run-time libraries (loaded with dlopen) - alsaLib # ALSA sound + alsa-lib # ALSA sound libXrandr # X11 resolution detection libXScrnSaver # X11 screensaver prevention udev # udev input drivers diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index a5796f697ef1..3fb8236947f4 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, nasm, makeDesktopItem -, alsaLib, flac, gtk2, libvorbis, libvpx, libGLU, libGL +, alsa-lib, flac, gtk2, libvorbis, libvpx, libGLU, libGL , SDL2, SDL2_mixer }: let @@ -27,7 +27,7 @@ in stdenv.mkDerivation { sha256 = "972630059be61ef9564a241b84ef2ee4f69fc85c19ee36ce46052ff2f1ce3bf9"; }; - buildInputs = [ alsaLib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; + buildInputs = [ alsa-lib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; nativeBuildInputs = [ makeWrapper pkg-config ] ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 879bbfa2311f..9798d659322c 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem -, alsaLib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL +, alsa-lib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL , libSM, libICE, libXext, factorio-utils , releaseType , mods ? [] @@ -182,7 +182,7 @@ let buildInputs = [ libpulseaudio ]; libPath = lib.makeLibraryPath [ - alsaLib + alsa-lib libpulseaudio libX11 libXcursor diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix index 4d6795070ca2..07aad4a5b604 100644 --- a/pkgs/games/gambatte/default.nix +++ b/pkgs/games/gambatte/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, scons, qt4, alsaLib }: +{ lib, stdenv, fetchFromGitHub, scons, qt4, alsa-lib }: stdenv.mkDerivation { pname = "gambatte"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0cc6zcvxpvi5hgcssb1zy0fkj9nk7n0d2xm88a4v05kpm5zw7sh2"; }; - buildInputs = [ scons qt4 alsaLib ]; + buildInputs = [ scons qt4 alsa-lib ]; patches = [ ./fix-scons-paths.patch ]; diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 3ec196b7373e..f16aa7526327 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_mixer, alsaLib, libpng +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_mixer, alsa-lib, libpng , pcre, makeDesktopItem }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ SDL2 SDL2_mixer alsaLib libpng pcre ]; + buildInputs = [ SDL2 SDL2_mixer alsa-lib libpng pcre ]; hardeningDisable = ["all"]; diff --git a/pkgs/games/methane/default.nix b/pkgs/games/methane/default.nix index 17c9dc425677..071e1a64b545 100644 --- a/pkgs/games/methane/default.nix +++ b/pkgs/games/methane/default.nix @@ -16,7 +16,7 @@ , clanlib , libXrender , libmikmod -, alsaLib +, alsa-lib }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { clanlib libXrender libmikmod - alsaLib + alsa-lib ]; installPhase = '' diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 7e1a0cba1760..732079238395 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -12,7 +12,7 @@ , pkg-config , stb , ant -, alsaLib +, alsa-lib , glew # Make the build version easily overridable. @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals enableClient [ SDL2 glew - alsaLib + alsa-lib ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 3d0b53035edd..254c01fdf1b6 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -15,7 +15,7 @@ , pango , cairo , expat -, alsaLib +, alsa-lib , cups , dbus , atk @@ -45,13 +45,13 @@ let curl libpulseaudio systemd - alsaLib # needed for narrator + alsa-lib # needed for narrator flite # needed for narrator libXxf86vm # needed only for versions <1.13 ]; libPath = lib.makeLibraryPath ([ - alsaLib + alsa-lib atk cairo cups diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index 84d8a6200015..4082e853aa30 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -3,7 +3,7 @@ unzip, zlib, curl, libjpeg, libpng, libvorbis, libtheora , libogg, libmodplug , # glx - libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, libXxf86dga, alsaLib + libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, libXxf86dga, alsa-lib , # sdl SDL }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ unzip ]; buildInputs = [ # glx - libX11 libGLU libGL libXpm libXext libXxf86vm libXxf86dga alsaLib + libX11 libGLU libGL libXpm libXext libXxf86vm libXxf86dga alsa-lib # sdl SDL ]; diff --git a/pkgs/games/oh-my-git/default.nix b/pkgs/games/oh-my-git/default.nix index 89dc1bdd50ea..542effa65965 100644 --- a/pkgs/games/oh-my-git/default.nix +++ b/pkgs/games/oh-my-git/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , makeDesktopItem , stdenv -, alsaLib +, alsa-lib , gcc-unwrapped , git , godot-export-templates @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib + alsa-lib gcc-unwrapped.lib git libGLU diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index 0c9c71e38d21..32e1ef4fca93 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkg-config -, alsaLib, libpulseaudio, SDL2, SDL2_image, SDL2_mixer }: +, alsa-lib, libpulseaudio, SDL2, SDL2_image, SDL2_mixer }: # - set the opendune configuration at ~/.config/opendune/opendune.ini: # [opendune] @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { }; configureFlags = [ - "--with-alsa=${lib.getLib alsaLib}/lib/libasound.so" + "--with-alsa=${lib.getLib alsa-lib}/lib/libasound.so" "--with-pulse=${lib.getLib libpulseaudio}/lib/libpulse.so" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsaLib libpulseaudio SDL2 SDL2_image SDL2_mixer ]; + buildInputs = [ alsa-lib libpulseaudio SDL2 SDL2_image SDL2_mixer ]; enableParallelBuilding = true; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 4cde6b032ee2..5f5dd5f45ca9 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchFromGitHub, fetchurl, makeWrapper, makeDesktopItem, linkFarmFromDrvs , dotnetCorePackages, dotnetPackages, cacert -, ffmpeg_4, alsaLib, SDL2, lttng-ust, numactl, alsaPlugins +, ffmpeg_4, alsa-lib, SDL2, lttng-ust, numactl, alsaPlugins }: let runtimeDeps = [ - ffmpeg_4 alsaLib SDL2 lttng-ust numactl + ffmpeg_4 alsa-lib SDL2 lttng-ust numactl ]; dotnet-sdk = dotnetCorePackages.sdk_5_0; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 7dbca783b67b..c29af6d810f5 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk +{ lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk , nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg }: # TODO: use dynamic attributes once Nix 1.7 is out @@ -34,7 +34,7 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index 691406160d1d..25c6b4ddec09 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, curl, libGL, libX11, libXxf86dga, alsaLib, libXrandr, libXxf86vm, libXext, fetchFromGitHub }: +{ lib, stdenv, curl, libGL, libX11, libXxf86dga, alsa-lib, libXrandr, libXxf86vm, libXext, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "Quake3e"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1jvk8qd0mi0x8lslknhkfd8h6ridwca34c6qahsbmmpcgsvdv16s"; }; - buildInputs = [ curl libGL libX11 libXxf86dga alsaLib libXrandr libXxf86vm libXext ]; + buildInputs = [ curl libGL libX11 libXxf86dga alsa-lib libXrandr libXxf86vm libXext ]; enableParallelBuilding = true; postPatch = '' sed -i -e 's#OpenGLLib = dlopen( dllname#OpenGLLib = dlopen( "${libGL}/lib/libGL.so"#' code/unix/linux_qgl.c - sed -i -e 's#Sys_LoadLibrary( "libasound.so.2" )#Sys_LoadLibrary( "${alsaLib}/lib/libasound.so.2" )#' code/unix/linux_snd.c + sed -i -e 's#Sys_LoadLibrary( "libasound.so.2" )#Sys_LoadLibrary( "${alsa-lib}/lib/libasound.so.2" )#' code/unix/linux_snd.c sed -i -e 's#Sys_LoadLibrary( "libXrandr.so.2" )#Sys_LoadLibrary( "${libXrandr}/lib/libXrandr.so.2" )#' code/unix/x11_randr.c sed -i -e 's#Sys_LoadLibrary( "libXxf86vm.so.1" )#Sys_LoadLibrary( "${libXxf86vm}/lib/libXxf86vm.so.1" )#' code/unix/x11_randr.c sed -i -e 's#Sys_LoadLibrary( "libXxf86dga.so.1" )#Sys_LoadLibrary( "${libXxf86dga}/lib/libXxf86dga.so.1" )#' code/unix/x11_dga.c diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index 51dd4f908601..9a836c595087 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib +{ lib, stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsa-lib , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported, libGLU, libGL ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "99c419b13885a49bdfc10a50a3a6000fd1ba9504f6aae04c74b840ec6f57a963"; }; - buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ] + buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsa-lib ] ++ lib.optionals openglSupport [ libGL libGLU ]; configureFlags = [ "--enable-all-engines" ]; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 68ccb894d992..b22d292f2070 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, nasm -, alsaLib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib +, alsa-lib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU, libGL, SDL2, zlib , Cocoa, AudioToolbox, Carbon, CoreMIDI, AudioUnit, cctools }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; buildInputs = lib.optionals stdenv.isLinux [ - alsaLib + alsa-lib ] ++ lib.optionals stdenv.isDarwin [ Cocoa AudioToolbox Carbon CoreMIDI AudioUnit ] ++ [ diff --git a/pkgs/games/shticker-book-unwritten/default.nix b/pkgs/games/shticker-book-unwritten/default.nix index 0179c7c86e87..7dbd5c257e89 100644 --- a/pkgs/games/shticker-book-unwritten/default.nix +++ b/pkgs/games/shticker-book-unwritten/default.nix @@ -6,7 +6,7 @@ let in buildFHSUserEnv { name = "shticker_book_unwritten"; targetPkgs = pkgs: with pkgs; [ - alsaLib + alsa-lib xorg.libX11 xorg.libXcursor xorg.libXext diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index fe3dde7167b5..a0557eed9b12 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -136,7 +136,7 @@ in buildFHSUserEnv rec { libGLU libuuid libbsd - alsaLib + alsa-lib # Loop Hero libidn2 diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 8e4f5b866bbc..765ecbed28f2 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -6,7 +6,7 @@ let overridePkgs = lib.optionals (!runtimeOnly) (with pkgs; [ libgpgerror libpulseaudio - alsaLib + alsa-lib openalSoft libva1 libvdpau diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 1512359d495f..70e1acb1f34f 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, nasm -, gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis +, gtk2, glib, ffmpeg, alsa-lib, libmad, libogg, libvorbis , glew, libpulseaudio, udev }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ]; buildInputs = [ - gtk2 glib ffmpeg alsaLib libmad libogg libvorbis + gtk2 glib ffmpeg alsa-lib libmad libogg libvorbis glew libpulseaudio udev ]; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 19f562d54af1..b0a49cc77d1f 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsaLib +{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsa-lib , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils , nixosTests }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config icoutils ]; buildInputs = [ - python3 alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack + python3 alsa-lib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack ]; postInstall = '' diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index a60ec15744cb..4a25d26f8cc5 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, SDL, libpulseaudio, alsaLib, runtimeShell }: +{ lib, stdenv, requireFile, SDL, libpulseaudio, alsa-lib, runtimeShell }: stdenv.mkDerivation rec { name = "vessel-12082012"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ld_preload = ./isatty.c; libPath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + lib.makeLibraryPath [ SDL libpulseaudio alsaLib ] ; + + ":" + lib.makeLibraryPath [ SDL libpulseaudio alsa-lib ] ; installPhase = '' mkdir -p $out/libexec/strangeloop/vessel/ diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index fb6cb93f7f24..38a0450168ef 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -3,7 +3,7 @@ , # required for both unzip, libjpeg, zlib, libvorbis, curl , # glx - libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsaLib + libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsa-lib , # sdl SDL2 @@ -64,7 +64,7 @@ let nativeBuildInputs = [ unzip ]; buildInputs = [ libjpeg zlib libvorbis curl ] - ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsaLib.dev ] + ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsa-lib.dev ] ++ lib.optional withSDL [ SDL2.dev ]; sourceRoot = "Xonotic/source/darkplaces"; diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix index 4b09cb170c04..59075d69c753 100644 --- a/pkgs/games/zandronum/fmod.nix +++ b/pkgs/games/zandronum/fmod.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchurl, alsaLib, libpulseaudio, undmg }: +{ stdenv, lib, fetchurl, alsa-lib, libpulseaudio, undmg }: let bits = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64"; - libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib libpulseaudio ]; + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsa-lib libpulseaudio ]; in stdenv.mkDerivation rec { |