b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gst_all_1.gst-editing-services: 1.18.5 -> 1.20.0

Browse source
This commit is contained in:
Jonathan Ringer 2022-02-05 13:12:37 -08:00
parent 80793761a6
commit ee01a36d22
No known key found for this signature in database
GPG key ID: 5C841D3CFDFEC4E0
2 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/gstreamer/ges/default.nix
View file

@ -16,7 +16,7 @@
stdenv.mkDerivation rec {
pname = "gst-editing-services";
version = "1.18.5";
version = "1.20.0";
outputs = [
"out"
@ -26,13 +26,9 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-ivSoOU0FHz4YKAaG20mm76zMlcDFmhfw9WTjIABZDfU=";
sha256 = "sha256-+Detz0Bz0ZpZCJhOh5zQOfQZLKNo5x056MzYpWuf7t8=";
};
patches = [
./fix_pkgconfig_includedir.patch
];
nativeBuildInputs = [
meson
ninja

15
pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch
View file

@ -1,15 +0,0 @@
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
index a612b21b..c017eaff 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', apiversion)
pkgconf.set('VERSION', gst_version)