diff options
| author | Bastian Köcher <git@kchr.de> | 2018-03-31 23:17:11 +0200 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2018-04-04 17:25:39 +0200 |
| commit | 2a80d83f59eeabe0140fca973e461bba7a02e48a (patch) | |
| tree | 807126091e0078ccc2dc961c7a9bb4d52f9bc441 /pkgs/development/libraries/gstreamer/libav | |
| parent | 42d3b5c846daf5cd0adf0fd2a2c6130a73e7849a (diff) | |
gst-libav: Switch to meson build system
Diffstat (limited to 'pkgs/development/libraries/gstreamer/libav')
| -rw-r--r-- | pkgs/development/libraries/gstreamer/libav/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 489315a257b6..564b37fab794 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, python, yasm -, gst-plugins-base, orc, bzip2 -, withSystemLibav ? true, libav ? null +{ stdenv, fetchurl, meson, ninja, pkgconfig +, python, yasm, gst-plugins-base, orc, bzip2 +, gettext, withSystemLibav ? true, libav ? null }: # Note that since gst-libav-1.6, libav is actually ffmpeg. See @@ -24,11 +24,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - configureFlags = stdenv.lib.optionalString withSystemLibav - "--with-system-libav"; - nativeBuildInputs = with stdenv.lib; - [ pkgconfig python ] + [ meson ninja gettext pkgconfig python ] ++ optional (!withSystemLibav) yasm ; |