From 56f1e61a9a8f0fe880f5ca8854cef833959b3b58 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 11 Jun 2023 14:40:59 -0500 Subject: [PATCH 1/2] libopus: fix pkg-config path --- pkgs/development/libraries/libopus/default.nix | 1 + .../libraries/libopus/fix-pkg-config-paths.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/libopus/fix-pkg-config-paths.patch diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 75d8cdc6ff25..b5e5c9e3bd2c 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -19,6 +19,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 { diff --git a/pkgs/development/libraries/libopus/fix-pkg-config-paths.patch b/pkgs/development/libraries/libopus/fix-pkg-config-paths.patch new file mode 100644 index 000000000000..d54b7f5558c9 --- /dev/null +++ b/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' : '') From 46c81a5e6b42f3c217eda8f17b460ffbb99ff83a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 11 Jun 2023 14:42:09 -0500 Subject: [PATCH 2/2] libopus: add ffmpeg as reverse dependencies to passthru.tests --- pkgs/development/libraries/libopus/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index b5e5c9e3bd2c..6c6e55a528e4 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -7,6 +7,9 @@ , ninja , fixedPoint ? false , withCustomModes ? true + +# tests +, ffmpeg-headless }: stdenv.mkDerivation rec { @@ -49,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/";