Merge pull request #237243 from marsam/libopus-fix-pkg-config

libopus: fix pkg-config path

pkgs/development/libraries/libopus/default.nix

@@ -7,6 +7,9 @@
 , ninja
 , fixedPoint ? false
 , withCustomModes ? true
+
+# tests
+, ffmpeg-headless
 }:
 
 stdenv.mkDerivation rec {
@@ -19,6 +22,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
+    ./fix-pkg-config-paths.patch
     # Fix meson build for arm64. Remove with next release
     # https://gitlab.xiph.org/xiph/opus/-/merge_requests/59
     (fetchpatch {
@@ -48,6 +52,10 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails
 
+  passthru.tests = {
+    inherit ffmpeg-headless;
+  };
+
   meta = with lib; {
     description = "Open, royalty-free, highly versatile audio codec";
     homepage = "https://opus-codec.org/";

pkgs/development/libraries/libopus/fix-pkg-config-paths.patch

@@ -0,0 +1,13 @@
+--- i/meson.build
++++ w/meson.build
+@@ -591,8 +591,8 @@ pkgconf = configuration_data()
+ 
+ pkgconf.set('prefix', join_paths(get_option('prefix')))
+ pkgconf.set('exec_prefix', '${prefix}')
+-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
+-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
++pkgconf.set('libdir', '${prefix}' / get_option('libdir'))
++pkgconf.set('includedir', '${prefix}' / get_option('includedir'))
+ pkgconf.set('VERSION', opus_version)
+ pkgconf.set('PC_BUILD', pc_build)
+ pkgconf.set('LIBM', libm.found() ? '-lm' : '')