From 4f7b421cc9be4cc12465ac59c549de72c29fbefe Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Mon, 9 May 2022 10:01:28 +0300 Subject: [PATCH] openalSoft: fix paths in pkg-config file --- .../development/libraries/openal-soft/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index d11d2f78bbd9..434918c0c87b 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config , alsaSupport ? !stdenv.isDarwin, alsa-lib , dbusSupport ? !stdenv.isDarwin, dbus , pipewireSupport ? !stdenv.isDarwin, pipewire @@ -17,9 +17,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-MVM0qCZDWcO7/Hnco+0dBqzBLcWD279xjx0slxxlc4w="; }; - # this will make it find its own data files (e.g. HRTF profiles) - # without any other configuration - patches = [ ./search-out.patch ]; + patches = [ + # this will make it find its own data files (e.g. HRTF profiles) + # without any other configuration + ./search-out.patch + # merged after 1.22.0 in https://github.com/kcat/openal-soft/pull/696 + (fetchpatch { + url = "https://github.com/kcat/openal-soft/commit/0bf2abae9b2121c3bc5a56dab30eca308136bc29.patch"; + sha256 = "1fhjjy7nrhrj3a0wlmsqpf8h3ss6s487vz5jrhamyv04nbcahn20"; + }) + ]; postPatch = '' substituteInPlace core/helpers.cpp \ --replace "@OUT@" $out