gst_all_1.gst-plugins-base: clean up

Follow up on f5fbcf260f.
This commit is contained in:
Jan Tojnar 2022-02-06 17:04:50 +01:00
parent 9b66f3684b
commit ec96146594
2 changed files with 2 additions and 17 deletions

View File

@ -116,8 +116,8 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs \
common/scangobj-merge.py \
scripts/
scripts/meson-pkg-config-file-fixup.py \
scripts/extract-release-date-from-doap-file.py
'';
# This package has some `_("string literal")` string formats

View File

@ -1,15 +0,0 @@
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
index 04abfbee5..88c86b431 100644
--- a/pkgconfig/meson.build
+++ b/pkgconfig/meson.build
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
pkgconf.set('prefix', 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', join_paths(get_option('prefix'), get_option('libdir')))
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
pkgconf.set('GST_API_VERSION', api_version)
pkgconf.set('VERSION', gst_version)
pkgconf.set('LIBM', libm.found() ? '-lm' : '')