public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gst-editing-services: Switch to meson build system

This commit is contained in:
Bastian Köcher 2018-04-01 00:17:58 +02:00
parent 69fb4ddb6e
commit fd5c1f665e
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gstreamer/default.nix
View File

@ -19,9 +19,7 @@ rec {
gnonlin = callPackage ./gnonlin { inherit gst-plugins-base; };
# TODO: gnonlin is deprecated in gst-editing-services, better switch to nle
# (Non Linear Engine).
gst-editing-services = callPackage ./ges { inherit gnonlin; };
gst-editing-services = callPackage ./ges { inherit gst-plugins-base; };
gst-vaapi = callPackage ./vaapi {
inherit gst-plugins-base gstreamer gst-plugins-bad;

17
pkgs/development/libraries/gstreamer/ges/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, python, gobjectIntrospection
, gnonlin, libxml2, flex, perl
{ stdenv, fetchurl, fetchpatch, meson, ninja
, pkgconfig, python, gst-plugins-base, libxml2
, flex, perl, gettext, gobjectIntrospection
}:
stdenv.mkDerivation rec {
@ -19,7 +20,15 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ];
nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection python flex perl ];
propagatedBuildInputs = [ gnonlin libxml2 ];
propagatedBuildInputs = [ gst-plugins-base libxml2 ];
patches = [
(fetchpatch {
url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370413";
sha256 = "1xcgbs18g6n5p7z7kqj7ffakwmkxq7ijajyvhyl7p3zvqll9dc7x";
})
./fix_pkgconfig_includedir.patch
];
}

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

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