summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorAlexander Shpilkin <ashpilkin@gmail.com>2022-05-09 10:01:28 +0300
committerArtturin <Artturin@artturin.com>2022-09-07 21:44:36 +0300
commit4f7b421cc9be4cc12465ac59c549de72c29fbefe (patch)
tree8c49eb52ed08ef55e6b4d84d150638dad9651864 /pkgs/development/libraries
parent869539e07d199b1aacf583a360667401b00c3125 (diff)
downloadnixpkgs-4f7b421cc9be4cc12465ac59c549de72c29fbefe.tar
nixpkgs-4f7b421cc9be4cc12465ac59c549de72c29fbefe.tar.gz
nixpkgs-4f7b421cc9be4cc12465ac59c549de72c29fbefe.tar.bz2
nixpkgs-4f7b421cc9be4cc12465ac59c549de72c29fbefe.tar.lz
nixpkgs-4f7b421cc9be4cc12465ac59c549de72c29fbefe.tar.xz
nixpkgs-4f7b421cc9be4cc12465ac59c549de72c29fbefe.tar.zst
nixpkgs-4f7b421cc9be4cc12465ac59c549de72c29fbefe.zip
openalSoft: fix paths in pkg-config file
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/openal-soft/default.nix15
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index d11d2f78bbd..434918c0c87 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