pyrox.dev / nixpkgs
lol
fork atom

openalSoft: 1.21.1 -> 1.22.0

Mihai Fufezan 8410b41a 8e9dc9e6

+16 -10
unified split
+14 -8
pkgs/development/libraries/openal-soft/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, cmake 2 , alsaSupport ? !stdenv.isDarwin, alsa-lib 3 , pulseSupport ? !stdenv.isDarwin, libpulseaudio 4 , CoreServices, AudioUnit, AudioToolbox 5 }: 6 7 stdenv.mkDerivation rec { 8 pname = "openal-soft"; 9 - version = "1.21.1"; 10 11 src = fetchFromGitHub { 12 owner = "kcat"; 13 repo = "openal-soft"; 14 rev = version; 15 - sha256 = "sha256-rgc6kjXaZb6sCR+e9Gu7BEEHIiCHMygpLIeSqgWkuAg="; 16 }; 17 18 # this will make it find its own data files (e.g. HRTF profiles) 19 # without any other configuration 20 patches = [ ./search-out.patch ]; 21 postPatch = '' 22 - substituteInPlace alc/helpers.cpp \ 23 --replace "@OUT@" $out 24 ''; 25 26 strictDeps = true; 27 28 - nativeBuildInputs = [ cmake ]; 29 30 buildInputs = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.cc.libc 31 ++ lib.optional alsaSupport alsa-lib 32 ++ lib.optional pulseSupport libpulseaudio 33 ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; 34 35 - NIX_LDFLAGS = toString ( 36 - lib.optional alsaSupport "-lasound" 37 - ++ lib.optional pulseSupport "-lpulse"); 38 39 meta = with lib; { 40 description = "OpenAL alternative";
··· 1 + { lib, stdenv, fetchFromGitHub, cmake, pkg-config 2 , alsaSupport ? !stdenv.isDarwin, alsa-lib 3 + , dbusSupport ? !stdenv.isDarwin, dbus 4 + , pipewireSupport ? !stdenv.isDarwin, pipewire 5 , pulseSupport ? !stdenv.isDarwin, libpulseaudio 6 , CoreServices, AudioUnit, AudioToolbox 7 }: 8 9 stdenv.mkDerivation rec { 10 pname = "openal-soft"; 11 + version = "1.22.0"; 12 13 src = fetchFromGitHub { 14 owner = "kcat"; 15 repo = "openal-soft"; 16 rev = version; 17 + sha256 = "sha256-Y2KhPkwtG6tBzUhSqwV2DVnOjZwxPihidLKahjaIvyU="; 18 }; 19 20 # this will make it find its own data files (e.g. HRTF profiles) 21 # without any other configuration 22 patches = [ ./search-out.patch ]; 23 postPatch = '' 24 + substituteInPlace core/helpers.cpp \ 25 --replace "@OUT@" $out 26 ''; 27 28 strictDeps = true; 29 30 + nativeBuildInputs = [ cmake pkg-config ]; 31 32 buildInputs = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.cc.libc 33 ++ lib.optional alsaSupport alsa-lib 34 + ++ lib.optional dbusSupport dbus 35 + ++ lib.optional pipewireSupport pipewire 36 ++ lib.optional pulseSupport libpulseaudio 37 ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; 38 39 + cmakeFlags = [ 40 + # Automatically links dependencies without having to rely on dlopen, thus 41 + # removes the need for NIX_LDFLAGS. 42 + "-DALSOFT_DLOPEN=OFF" 43 + ]; 44 45 meta = with lib; { 46 description = "OpenAL alternative";
+2 -2
pkgs/development/libraries/openal-soft/search-out.patch
··· 1 diff --git a/alc/helpers.cpp b/alc/helpers.cpp 2 index 8c1c856..19bbc0f 100644 3 - --- a/alc/helpers.cpp 4 - +++ b/alc/helpers.cpp 5 @@ -402,6 +402,7 @@ al::vector<std::string> SearchDataFiles(const char *ext, const char *subdir) 6 7 DirectorySearch(path.c_str(), ext, &results);
··· 1 diff --git a/alc/helpers.cpp b/alc/helpers.cpp 2 index 8c1c856..19bbc0f 100644 3 + --- a/core/helpers.cpp 4 + +++ b/core/helpers.cpp 5 @@ -402,6 +402,7 @@ al::vector<std::string> SearchDataFiles(const char *ext, const char *subdir) 6 7 DirectorySearch(path.c_str(), ext, &results);