diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-02-26 21:25:29 +0100 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-02-27 12:16:26 +0100 |
commit | 3d104ab2b3e578cb4599b6fffbcc019b09547521 (patch) | |
tree | da0852033c00cee83ac2dc46281c307d38ae5259 /pkgs/development/libraries/gstreamer | |
parent | c49533a4949b5fc7d3511dce7df4c27f811df4d7 (diff) | |
download | nixlib-3d104ab2b3e578cb4599b6fffbcc019b09547521.tar nixlib-3d104ab2b3e578cb4599b6fffbcc019b09547521.tar.gz nixlib-3d104ab2b3e578cb4599b6fffbcc019b09547521.tar.bz2 nixlib-3d104ab2b3e578cb4599b6fffbcc019b09547521.tar.lz nixlib-3d104ab2b3e578cb4599b6fffbcc019b09547521.tar.xz nixlib-3d104ab2b3e578cb4599b6fffbcc019b09547521.tar.zst nixlib-3d104ab2b3e578cb4599b6fffbcc019b09547521.zip |
gst-plugins-base: align attrname with pkgname
Diffstat (limited to 'pkgs/development/libraries/gstreamer')
8 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index 2e30782f44bb..0e8dfec65f4b 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gst_plugins_base, gstreamer }: +{ stdenv, fetchurl, pkgconfig, gst-plugins-base, gstreamer }: stdenv.mkDerivation rec { name = "gnonlin-0.10.17"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0dc9kvr6i7sh91cyhzlbx2bchwg84rfa4679ccppzjf0y65dv8p4"; }; - buildInputs = [ gst_plugins_base gstreamer pkgconfig ]; + buildInputs = [ gst-plugins-base gstreamer pkgconfig ]; meta = { homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix index 18d483594efb..484075f73f75 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm, orc +{ fetchurl, stdenv, pkgconfig, gst-plugins-base, bzip2, yasm, orc , useInternalFfmpeg ? false, ffmpeg ? null }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg"; buildInputs = - [ pkgconfig bzip2 gst_plugins_base orc ] + [ pkgconfig bzip2 gst-plugins-base orc ] ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]); meta = { diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix index 988d1bba258a..fecc77b2a544 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base +{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base , libdvdnav, libdvdread, orc }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread orc ]; + [ pkgconfig glib gstreamer gst-plugins-base libdvdnav libdvdread orc ]; enableParallelBuilding = true; 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 af6e3be401b0..9339de3d9ed4 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, lib, 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 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-experimental" "--disable-oss" ]; buildInputs = - [ pkgconfig glib gstreamer gst_plugins_base ] + [ pkgconfig glib gstreamer gst-plugins-base ] ++ lib.optional stdenv.isLinux libpulseaudio ++ libintlOrEmpty ++ lib.optionals (!minimalDeps) diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 8e4e662dc3b3..9863b3e01285 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base +{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base , libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintlOrEmpty }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc lame ] ++ libintlOrEmpty; + [ pkgconfig glib gstreamer gst-plugins-base libmad libdvdread a52dec x264 orc lame ] ++ libintlOrEmpty; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index d78b50a7821a..fd01aa5c1dce 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, python2Packages, gstreamer, gst_plugins_base +{ fetchurl, stdenv, pkgconfig, python2Packages, gstreamer, gst-plugins-base }: let @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { patches = [ ./disable-testFake.patch ]; buildInputs = - [ pkgconfig gst_plugins_base pygobject2 ] + [ pkgconfig gst-plugins-base pygobject2 ] ; propagatedBuildInputs = [ gstreamer python ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index ce6ae9318363..f181aa029bd7 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibmm, gstreamer, gst_plugins_base, libsigcxx, libxmlxx, pkgconfig }: +{ stdenv, fetchurl, glibmm, gstreamer, gst-plugins-base, libsigcxx, libxmlxx, pkgconfig }: let ver_maj = "0.10"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = false; # Tests require pulseaudio in /homeless-shelter propagatedBuildInputs = [ - glibmm gstreamer gst_plugins_base libsigcxx libxmlxx + glibmm gstreamer gst-plugins-base libsigcxx libxmlxx ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix index c0cab607062d..d298fbd7fc33 100644 --- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gstreamer, gst_plugins_base, boost, glib, qt4, cmake +{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost, glib, qt4, cmake , automoc4, flex, bison, pkgconfig }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl"; }; - buildInputs = [ gstreamer gst_plugins_base glib qt4 ]; + buildInputs = [ gstreamer gst-plugins-base glib qt4 ]; propagatedBuildInputs = [ boost ]; nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; |