diff options
| author | Bastian Köcher <git@kchr.de> | 2018-04-01 00:17:58 +0200 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2018-04-04 17:25:39 +0200 |
| commit | fd5c1f665e814acecaf1f2a93af6cf82c336aad3 (patch) | |
| tree | 62fec636a2f92d996e2e1a5a6aca3eed98b52703 /pkgs/development/libraries/gstreamer/ges | |
| parent | 69fb4ddb6e08b969b4cae1a471975c5a4e049fef (diff) | |
gst-editing-services: Switch to meson build system
Diffstat (limited to 'pkgs/development/libraries/gstreamer/ges')
| -rw-r--r-- | pkgs/development/libraries/gstreamer/ges/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch | 15 |
2 files changed, 28 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index a92eaa33e6da..895f298c8269 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -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 + ]; } diff --git a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch new file mode 100644 index 000000000000..6dff6aae39f4 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch @@ -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) + |