public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13580 from matthewbauer/openal-darwin

Browse Source 
openal darwin fixes
This commit is contained in:
vbgl 2016-03-02 19:35:21 +01:00
commit dfe69e2f4f
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/openal-soft/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, cmake { stdenv, fetchurl, cmake
, alsaSupport ? true, alsaLib ? null , alsaSupport ? !stdenv.isDarwin, alsaLib ? null
, pulseSupport ? true, libpulseaudio ? null , pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null
, CoreServices, AudioUnit, AudioToolbox
}: }:
with stdenv.lib; with stdenv.lib;
@ -9,17 +10,18 @@ assert alsaSupport -> alsaLib != null;
assert pulseSupport -> libpulseaudio != null; assert pulseSupport -> libpulseaudio != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.16.0"; version = "1.17.2";
name = "openal-soft-${version}"; name = "openal-soft-${version}";
src = fetchurl { src = fetchurl {
url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2"; url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2";
sha256 = "0pqdykdclycfnk66v166srjrry936y39d1dz9wl92qz27wqwsg9g"; sha256 = "051k5fy8pk4fd9ha3qaqcv08xwbks09xl5qs4ijqq2qz5xaghhd3";
}; };
buildInputs = [ cmake ] buildInputs = [ cmake ]
++ optional alsaSupport alsaLib ++ optional alsaSupport alsaLib
++ optional pulseSupport libpulseaudio; ++ optional pulseSupport libpulseaudio
++ optional stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];
NIX_LDFLAGS = [] NIX_LDFLAGS = []
++ optional alsaSupport "-lasound" ++ optional alsaSupport "-lasound"
@ -30,5 +32,6 @@ stdenv.mkDerivation rec {
homepage = http://kcat.strangesoft.net/openal.html; homepage = http://kcat.strangesoft.net/openal.html;
license = licenses.lgpl2; license = licenses.lgpl2;
maintainers = with maintainers; [ftrvxmtrx]; maintainers = with maintainers; [ftrvxmtrx];
platforms = platforms.unix;
}; };
} }

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

@ -8244,7 +8244,9 @@ let
oniguruma = callPackage ../development/libraries/oniguruma { }; oniguruma = callPackage ../development/libraries/oniguruma { };
openal = openalSoft; openal = openalSoft;
openalSoft = callPackage ../development/libraries/openal-soft { }; openalSoft = callPackage ../development/libraries/openal-soft {
inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
};
openbabel = callPackage ../development/libraries/openbabel { }; openbabel = callPackage ../development/libraries/openbabel { };