diff options
| author | Bastian Köcher <git@kchr.de> | 2018-03-31 22:37:29 +0200 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2018-04-04 17:25:39 +0200 |
| commit | fd0474e6f86a578ceb9709fc2fe2a5745602b38a (patch) | |
| tree | c0b8b022cd187d9e33be6e7246c040f7fc37509b /pkgs | |
| parent | edd17a0cabefd208360e26e54d31b47f3340fe63 (diff) | |
| download | nixpkgs-fd0474e6f86a578ceb9709fc2fe2a5745602b38a.tar nixpkgs-fd0474e6f86a578ceb9709fc2fe2a5745602b38a.tar.gz nixpkgs-fd0474e6f86a578ceb9709fc2fe2a5745602b38a.tar.bz2 nixpkgs-fd0474e6f86a578ceb9709fc2fe2a5745602b38a.tar.lz nixpkgs-fd0474e6f86a578ceb9709fc2fe2a5745602b38a.tar.xz nixpkgs-fd0474e6f86a578ceb9709fc2fe2a5745602b38a.tar.zst nixpkgs-fd0474e6f86a578ceb9709fc2fe2a5745602b38a.zip | |
gst-plugins-good: Switch to meson build system
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gstreamer/good/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch | 15 |
2 files changed, 20 insertions, 8 deletions
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index aba965d4c70..7f4e4d7dd09 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -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"; } diff --git a/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch new file mode 100644 index 00000000000..b506a0eda39 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/good/fix_pkgconfig_includedir.patch @@ -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) + |