From f3336a122acafd02fad80af31595c38dfd3133b6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 29 Feb 2016 12:46:34 -0600 Subject: [PATCH 1/2] openal: 1.16.0 -> 1.17.2 --- pkgs/development/libraries/openal-soft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 89dc32b61f2..ff29b2741fb 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -9,12 +9,12 @@ assert alsaSupport -> alsaLib != null; assert pulseSupport -> libpulseaudio != null; stdenv.mkDerivation rec { - version = "1.16.0"; + version = "1.17.2"; name = "openal-soft-${version}"; src = fetchurl { url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2"; - sha256 = "0pqdykdclycfnk66v166srjrry936y39d1dz9wl92qz27wqwsg9g"; + sha256 = "051k5fy8pk4fd9ha3qaqcv08xwbks09xl5qs4ijqq2qz5xaghhd3"; }; buildInputs = [ cmake ] From d085a649c231f48e4b7f58c0f10d609fd76a7389 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 29 Feb 2016 12:47:12 -0600 Subject: [PATCH 2/2] openal: fix darwin builds --- pkgs/development/libraries/openal-soft/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index ff29b2741fb..4a466ad133a 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, cmake -, alsaSupport ? true, alsaLib ? null -, pulseSupport ? true, libpulseaudio ? null +, alsaSupport ? !stdenv.isDarwin, alsaLib ? null +, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null +, CoreServices, AudioUnit, AudioToolbox }: with stdenv.lib; @@ -19,7 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ] ++ optional alsaSupport alsaLib - ++ optional pulseSupport libpulseaudio; + ++ optional pulseSupport libpulseaudio + ++ optional stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; NIX_LDFLAGS = [] ++ optional alsaSupport "-lasound" @@ -30,5 +32,6 @@ stdenv.mkDerivation rec { homepage = http://kcat.strangesoft.net/openal.html; license = licenses.lgpl2; maintainers = with maintainers; [ftrvxmtrx]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d014ba39340..ed5bf87643d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8221,7 +8221,9 @@ let oniguruma = callPackage ../development/libraries/oniguruma { }; 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 { };