openal to openalSoft conversion

+11 -11
+2 -2
pkgs/applications/networking/instant-messengers/qtox/default.nix
··· 1 - { stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openalSoft, opencv 1 + { stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openal, opencv 2 2 , libsodium, libXScrnSaver }: 3 3 4 4 let ··· 30 30 31 31 buildInputs = 32 32 [ 33 - libtoxcore openalSoft opencv libsodium filteraudio 33 + libtoxcore openal opencv libsodium filteraudio 34 34 qt5.base qt5.tools libXScrnSaver 35 35 ]; 36 36 nativeBuildInputs = [ pkgconfig ];
+2 -2
pkgs/games/0ad/default.nix
··· 1 1 { stdenv, callPackage, fetchurl, python27 2 2 , pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng 3 3 , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc 4 - , openalSoft, mesa, xproto, libX11, libXcursor, nspr, SDL 4 + , openal, mesa, xproto, libX11, libXcursor, nspr, SDL 5 5 , gloox, nvidia-texture-tools 6 6 , withEditor ? true, wxGTK ? null 7 7 }: ··· 31 31 buildInputs = [ 32 32 zeroadData python27 pkgconfig spidermonkey_24 boost icu 33 33 libxml2 libpng libjpeg zlib curl libogg libvorbis enet 34 - miniupnpc openalSoft mesa xproto libX11 libXcursor nspr 34 + miniupnpc openal mesa xproto libX11 libXcursor nspr 35 35 SDL gloox nvidia-texture-tools 36 36 ] ++ stdenv.lib.optional withEditor wxGTK; 37 37
+2 -2
pkgs/games/dhewm3/default.nix
··· 1 1 {stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis 2 - , openalSoft, curl }: 2 + , openal, curl }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b"; ··· 19 19 cd */neo 20 20 ''; 21 21 22 - buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openalSoft 22 + buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openal 23 23 curl ]; 24 24 25 25 enableParallelBuilding = true;
+2 -2
pkgs/games/warzone2100/default.nix
··· 1 1 { stdenv, fetchurl, bison, flex, gettext, pkgconfig, libpng 2 - , libtheora, openalSoft, physfs, mesa, fribidi, fontconfig 2 + , libtheora, openal, physfs, mesa, fribidi, fontconfig 3 3 , freetype, qt4, glew, libogg, libvorbis, zlib, libX11 4 4 , libXrandr, zip, unzip, which 5 5 , withVideos ? false ··· 16 16 url = "mirror://sourceforge/${pname}/warzone2100/Videos/high-quality-en/sequences.wz"; 17 17 sha256 = "90ff552ca4a70e2537e027e22c5098ea4ed1bc11bb7fc94138c6c941a73d29fa"; 18 18 }; 19 - buildInputs = [ bison flex gettext pkgconfig libpng libtheora openalSoft 19 + buildInputs = [ bison flex gettext pkgconfig libpng libtheora openal 20 20 physfs mesa fribidi fontconfig freetype qt4 21 21 glew libogg libvorbis zlib libX11 libXrandr zip 22 22 unzip
+3 -3
pkgs/top-level/all-packages.nix
··· 7335 7335 7336 7336 oniguruma = callPackage ../development/libraries/oniguruma { }; 7337 7337 7338 - openal = callPackage ../development/libraries/openal { }; 7339 - 7340 - # added because I hope that it has been easier to compile on x86 (for blender) 7338 + # openalSoft is 100% ABI compatible to openalLegacy and should be a default 7339 + openal = openalSoft; 7340 + openalLegacy = callPackage ../development/libraries/openal { }; 7341 7341 openalSoft = callPackage ../development/libraries/openal-soft { }; 7342 7342 7343 7343 openbabel = callPackage ../development/libraries/openbabel { };