From ee01a36d2233fe4cc031a1488f65ccdfad4b7ca8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 13:12:37 -0800 Subject: [PATCH] gst_all_1.gst-editing-services: 1.18.5 -> 1.20.0 --- .../libraries/gstreamer/ges/default.nix | 8 ++------ .../gstreamer/ges/fix_pkgconfig_includedir.patch | 15 --------------- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 0bfe6f3e0e2f..4630ce6d0ce4 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -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 diff --git a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch deleted file mode 100644 index 1e12f3bbfbea..000000000000 --- a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch +++ /dev/null @@ -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) -