diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-06-11 14:40:59 -0500 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2023-06-11 14:40:59 -0500 |
| commit | 56f1e61a9a8f0fe880f5ca8854cef833959b3b58 (patch) | |
| tree | e7a25e30eb66d5f4107de93b68e528391a6efc4b /pkgs/development/libraries/libopus | |
| parent | 127e0634dcd274e2062e1607b1732f84904e92a1 (diff) | |
| download | nixpkgs-56f1e61a9a8f0fe880f5ca8854cef833959b3b58.tar nixpkgs-56f1e61a9a8f0fe880f5ca8854cef833959b3b58.tar.gz nixpkgs-56f1e61a9a8f0fe880f5ca8854cef833959b3b58.tar.bz2 nixpkgs-56f1e61a9a8f0fe880f5ca8854cef833959b3b58.tar.lz nixpkgs-56f1e61a9a8f0fe880f5ca8854cef833959b3b58.tar.xz nixpkgs-56f1e61a9a8f0fe880f5ca8854cef833959b3b58.tar.zst nixpkgs-56f1e61a9a8f0fe880f5ca8854cef833959b3b58.zip | |
libopus: fix pkg-config path
Diffstat (limited to 'pkgs/development/libraries/libopus')
| -rw-r--r-- | pkgs/development/libraries/libopus/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/libopus/fix-pkg-config-paths.patch | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 75d8cdc6ff2..b5e5c9e3bd2 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 00000000000..d54b7f5558c --- /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' : '') |