From c9bcec2e880897505dae6972bc32f8f3cfe2d3d7 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 31 Aug 2016 15:34:53 +0300 Subject: [PATCH] gst_plugins_good: fix minimalDeps build --- .../gstreamer/legacy/gst-plugins-good/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 191c1f6b0f2c..f8a75c251226 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo +{ fetchurl, stdenv, lib, pkgconfig, gst_plugins_base, aalib, cairo , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx , libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc , glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintlOrEmpty @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { patches = [ ./v4l.patch ./linux-headers-3.9.patch ]; - configureFlags = "--enable-experimental --disable-oss"; + configureFlags = [ "--enable-experimental" "--disable-oss" ]; buildInputs = [ pkgconfig glib gstreamer gst_plugins_base ] - ++ stdenv.lib.optional stdenv.isLinux [ libpulseaudio ] + ++ lib.optional stdenv.isLinux [ libpulseaudio ] ++ libintlOrEmpty - ++ stdenv.lib.optionals (!minimalDeps) + ++ lib.optionals (!minimalDeps) [ aalib libcaca cairo libdv flac libjpeg libpng speex taglib bzip2 libvpx gdk_pixbuf orc libsoup libshout ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = '' + postInstall = lib.optionalString (!minimalDeps) '' substituteInPlace $out/lib/gstreamer-0.10/libgstaasink.la \ --replace "${ncurses.dev}/lib" "${ncurses.out}/lib" '';