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

gst-plugins-good: Switch to meson build system

Browse Source
This commit is contained in:
Bastian Köcher 2018-03-31 22:37:29 +02:00
parent edd17a0cab
commit fd0474e6f8
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, python
, gst-plugins-base, orc, bzip2
{ stdenv, fetchurl, meson, ninja, pkgconfig, python
, gst-plugins-base, orc, bzip2, gettext
, libv4l, libdv, libavc1394, libiec61883
, libvpx, speex, flac, taglib, libshout
, cairo, gdk_pixbuf, aalib, libcaca
@ -32,7 +32,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig python ];
patches = [ ./fix_pkgconfig_includedir.patch ];
nativeBuildInputs = [ pkgconfig python meson ninja gettext ];
buildInputs = [
gst-plugins-base orc bzip2
@ -44,10 +46,5 @@ stdenv.mkDerivation rec {
++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
preFixup = ''
mkdir -p "$dev/lib/gstreamer-1.0"
mv "$out/lib/gstreamer-1.0/"*.la "$dev/lib/gstreamer-1.0"
'';
LDFLAGS = optionalString stdenv.isDarwin "-lintl";
}

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

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