gst_all_1.gst-plugins-bad: 1.18.5 → 1.20.0

main
Jan Tojnar 2 years ago
parent 4a74ad996e
commit 827bc2e586
  1. 9
      pkgs/development/libraries/gstreamer/bad/default.nix
  2. 15
      pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch

@ -92,20 +92,15 @@
stdenv.mkDerivation rec {
pname = "gst-plugins-bad";
version = "1.18.5";
version = "1.20.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-oWSSO5Tw0IV4pvyuqsbgwF2niKRpA6EIaHDpykWtZ44=";
sha256 = "sha256-AVuNTZo5Xr9ETUCHaGeiA03TMEs61IvDoN0MHucdwR0=";
};
patches = [
# Use pkgconfig to inject the includedirs
./fix_pkgconfig_includedir.patch
];
nativeBuildInputs = [
meson
ninja

@ -1,15 +0,0 @@
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
index 271f327f3..7e2afa754 100644
--- a/pkgconfig/meson.build
+++ b/pkgconfig/meson.build
@@ -2,8 +2,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', 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)
Loading…
Cancel
Save