dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

openal to openalSoft conversion

Browse Source
This commit is contained in:
Joachim Schiele 2015-05-16 04:00:54 +02:00
parent e47fe46e03
commit bbd342dcf4
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/qtox/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openalSoft, opencv { stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openal, opencv
, libsodium, libXScrnSaver }: , libsodium, libXScrnSaver }:
let let
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ [
libtoxcore openalSoft opencv libsodium filteraudio libtoxcore openal opencv libsodium filteraudio
qt5.base qt5.tools libXScrnSaver qt5.base qt5.tools libXScrnSaver
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

4
pkgs/games/0ad/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, callPackage, fetchurl, python27 { stdenv, callPackage, fetchurl, python27
, pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng , pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openalSoft, mesa, xproto, libX11, libXcursor, nspr, SDL , openal, mesa, xproto, libX11, libXcursor, nspr, SDL
, gloox, nvidia-texture-tools , gloox, nvidia-texture-tools
, withEditor ? true, wxGTK ? null , withEditor ? true, wxGTK ? null
}: }:
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
zeroadData python27 pkgconfig spidermonkey_24 boost icu zeroadData python27 pkgconfig spidermonkey_24 boost icu
libxml2 libpng libjpeg zlib curl libogg libvorbis enet libxml2 libpng libjpeg zlib curl libogg libvorbis enet
miniupnpc openalSoft mesa xproto libX11 libXcursor nspr miniupnpc openal mesa xproto libX11 libXcursor nspr
SDL gloox nvidia-texture-tools SDL gloox nvidia-texture-tools
] ++ stdenv.lib.optional withEditor wxGTK; ] ++ stdenv.lib.optional withEditor wxGTK;

4
pkgs/games/dhewm3/default.nix
View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis {stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis
, openalSoft, curl }: , openal, curl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b"; hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
cd */neo cd */neo
''; '';
buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openalSoft buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openal
curl ]; curl ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/games/warzone2100/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, bison, flex, gettext, pkgconfig, libpng { stdenv, fetchurl, bison, flex, gettext, pkgconfig, libpng
, libtheora, openalSoft, physfs, mesa, fribidi, fontconfig , libtheora, openal, physfs, mesa, fribidi, fontconfig
, freetype, qt4, glew, libogg, libvorbis, zlib, libX11 , freetype, qt4, glew, libogg, libvorbis, zlib, libX11
, libXrandr, zip, unzip, which , libXrandr, zip, unzip, which
, withVideos ? false , withVideos ? false
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/${pname}/warzone2100/Videos/high-quality-en/sequences.wz"; url = "mirror://sourceforge/${pname}/warzone2100/Videos/high-quality-en/sequences.wz";
sha256 = "90ff552ca4a70e2537e027e22c5098ea4ed1bc11bb7fc94138c6c941a73d29fa"; sha256 = "90ff552ca4a70e2537e027e22c5098ea4ed1bc11bb7fc94138c6c941a73d29fa";
}; };
buildInputs = [ bison flex gettext pkgconfig libpng libtheora openalSoft buildInputs = [ bison flex gettext pkgconfig libpng libtheora openal
physfs mesa fribidi fontconfig freetype qt4 physfs mesa fribidi fontconfig freetype qt4
glew libogg libvorbis zlib libX11 libXrandr zip glew libogg libvorbis zlib libX11 libXrandr zip
unzip unzip

6
pkgs/top-level/all-packages.nix
View File

@ -7335,9 +7335,9 @@ let
oniguruma = callPackage ../development/libraries/oniguruma { }; oniguruma = callPackage ../development/libraries/oniguruma { };
openal = callPackage ../development/libraries/openal { }; # openalSoft is 100% ABI compatible to openalLegacy and should be a default
openal = openalSoft;
# added because I hope that it has been easier to compile on x86 (for blender) openalLegacy = callPackage ../development/libraries/openal { };
openalSoft = callPackage ../development/libraries/openal-soft { }; openalSoft = callPackage ../development/libraries/openal-soft { };
openbabel = callPackage ../development/libraries/openbabel { }; openbabel = callPackage ../development/libraries/openbabel { };