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

gst_all_1.gst-devtools: 1.18.5 -> 1.20.0

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

10
pkgs/development/libraries/gstreamer/devtools/default.nix
View file

@ -1,5 +1,6 @@
{ lib, stdenv
, fetchurl
, cairo
, meson
, ninja
, pkg-config
@ -12,17 +13,13 @@
stdenv.mkDerivation rec {
pname = "gst-devtools";
version = "1.18.5";
version = "1.20.0";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-/s/8hkR9r1wqBoQ8dXqZHXRcqiBpRGoNdG6ZsT98sHk=";
sha256 = "sha256-afyHVuydk+XFJYyZCIQ08gPpH9vFryjR8sWD/YGbeh0=";
};
patches = [
./fix_pkgconfig_includedir.patch
];
outputs = [
"out"
"dev"
@ -40,6 +37,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
cairo
python3
json-glib
];

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

@ -1,15 +0,0 @@
diff --git a/validate/pkgconfig/meson.build b/validate/pkgconfig/meson.build
index a612b21b..c017eaff 100644
--- a/validate/pkgconfig/meson.build
+++ b/validate/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)