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/applications | |
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/applications')
14 files changed, 29 insertions, 29 deletions
diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix index 1907d621e49f..d1c0c2afa83b 100644 --- a/pkgs/applications/audio/banshee/default.nix +++ b/pkgs/applications/audio/banshee/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst_plugins_base +{ pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base , gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-ffmpeg, glib , mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0 , boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - gtk-sharp-2_0.gtk gstreamer gst_plugins_base gst-plugins-good + gtk-sharp-2_0.gtk gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp gtk-sharp-2_0 boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index cf58dffef02c..01c8ecaced0d 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base +{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst-plugins-base , liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist , usbmuxd, libmtp, gvfs, libcdio, libspotify, protobuf, qca2, pkgconfig , sparsehash, config, makeWrapper, runCommand, gst_plugins }: @@ -27,7 +27,7 @@ let fftw gettext glew - gst_plugins_base + gst-plugins-base gstreamer gvfs libcdio diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix index 053c295be52f..d4c67bb5622c 100644 --- a/pkgs/applications/audio/morituri/default.nix +++ b/pkgs/applications/audio/morituri/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, pythonPackages, cdparanoia, cdrdao -, gst-python, gst_plugins_base, gst-plugins-good +, gst-python, gst-plugins-base, gst-plugins-good , utillinux, makeWrapper, substituteAll, autoreconfHook }: let @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ python cdparanoia cdrdao utillinux makeWrapper - gst_plugins_base gst-plugins-good + gst-plugins-base gst-plugins-good ] ++ pythonPath; patches = [ diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 2d97ba1d7639..fa582d852157 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, python2Packages, intltool -, gst-python, withGstPlugins ? false, gst_plugins_base ? null +, gst-python, withGstPlugins ? false, gst-plugins-base ? null , gst-plugins-good ? null, gst-plugins-ugly ? null, gst-plugins-bad ? null }: -assert withGstPlugins -> gst_plugins_base != null +assert withGstPlugins -> gst-plugins-base != null || gst-plugins-good != null || gst-plugins-ugly != null || gst-plugins-bad != null; @@ -44,7 +44,7 @@ in buildPythonApplication { patches = [ ./quodlibet-package-plugins.patch ]; buildInputs = stdenv.lib.optionals withGstPlugins [ - gst_plugins_base gst-plugins-good gst-plugins-ugly gst-plugins-bad + gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 3eca141ee62f..5ec5087b9f26 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, lib, makeWrapper, alsaLib, atk, cairo, gdk_pixbuf -, glib, gst-ffmpeg, gst-plugins-bad, gst_plugins_base +, glib, gst-ffmpeg, gst-plugins-bad, gst-plugins-base , gst-plugins-good, gst-plugins-ugly, gstreamer, gtk2, libSM, libX11 , libpng12, pango, zlib }: @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ gst_plugins_base gst-plugins-good + buildInputs = [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; dontPatchELF = true; libPath = lib.makeLibraryPath [ stdenv.cc.cc glib gtk2 atk pango cairo gdk_pixbuf alsaLib - libX11 libSM libpng12 gstreamer gst_plugins_base zlib + libX11 libSM libpng12 gstreamer gst-plugins-base zlib ]; installPhase = '' diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 80197999f5a3..01cd7a1df380 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -12,7 +12,7 @@ , gdk_pixbuf , glib , glibc -, gst_plugins_base +, gst-plugins-base , gstreamer , gtk2 , gtk3 @@ -94,7 +94,7 @@ stdenv.mkDerivation { gdk_pixbuf glib glibc - gst_plugins_base + gst-plugins-base gstreamer gtk2 gtk3 diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index a01cde4d6de6..f2da6257efd1 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -3,7 +3,7 @@ , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio +, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc, libpulseaudio , autoconf213, which , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl , enableGTK3 ? false @@ -42,7 +42,7 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec { libpulseaudio # only headers are needed ] ++ lib.optional enableGTK3 gtk3 - ++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst_plugins_base ]; + ++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst-plugins-base ]; nativeBuildInputs = [ autoconf213 which gnused ]; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index de21c37bc79e..73a828413600 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, makeDesktopItem , pkgconfig, autoconf213, alsaLib, bzip2, cairo , dbus, dbus_glib, file, fontconfig, freetype -, gstreamer, gst_plugins_base, gst_all_1 +, gstreamer, gst-plugins-base, gst_all_1 , gtk2, hunspell, icu, libevent, libjpeg, libnotify , libstartup_notification, libvpx, makeWrapper, mesa , nspr, nss, pango, perl, python, libpulseaudio, sqlite @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype - gst_plugins_base gstreamer gst_all_1.gst-plugins-base gtk2 + gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2 hunspell icu libevent libjpeg libnotify libstartup_notification libvpx makeWrapper mesa nspr nss pango perl pkgconfig python libpulseaudio sqlite unzip which yasm zip zlib diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 0531a58f0a23..ab010653c644 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -3,7 +3,7 @@ , alsaLib, dbus_libs, cups, libexif, ffmpeg, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz -, gstreamer, gst_plugins_base, libxml2 +, gstreamer, gst-plugins-base, libxml2 , glib, gtk2, pango, gdk_pixbuf, cairo, atk, gnome3 , nss, nspr , patchelf @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr - gstreamer libxml2 gst_plugins_base pango cairo gnome3.gconf + gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf patchelf ]; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index a7ddfd1ae418..2b831cdcaaf8 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig -, cairo, mpg123, gstreamer, gst-ffmpeg, gst_plugins_base, gst-plugins-bad +, cairo, mpg123, gstreamer, gst-ffmpeg, gst-plugins-base, gst-plugins-bad , gst-plugins-good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg , gsm, speex, portaudio, spandsp, libuuid, ccache }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0dhlgjkqn7jkd1pmdyid41c829clzmi5kczjdwxzh5ygn95lydjc"; }; buildInputs = [zlib openssl libre librem pkgconfig - cairo mpg123 gstreamer gst-ffmpeg gst_plugins_base gst-plugins-bad gst-plugins-good + cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid ccache ]; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 85dbd5f8d8f7..067b1c7884a7 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -2,7 +2,7 @@ , fetchurl , gcc , glib -, gst_plugins_base +, gst-plugins-base , gstreamer , icu , libpulseaudio @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { alsaLib gcc.cc glib - gst_plugins_base + gst-plugins-base gstreamer icu libpulseaudio diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 2bc65226c5fc..1b9c1ac1622f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -13,7 +13,7 @@ , gdk_pixbuf , glib , glibc -, gst_plugins_base +, gst-plugins-base , gstreamer , gtk2 , kerberos @@ -91,7 +91,7 @@ stdenv.mkDerivation { gdk_pixbuf glib glibc - gst_plugins_base + gst-plugins-base gstreamer gtk2 kerberos diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index f71a6dff37c5..d4ddfcfc4a69 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -3,7 +3,7 @@ , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu +, cairo, gstreamer, gst-plugins-base, icu , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl , debugBuild ? false , # If you want the resulting program to call itself "Thunderbird" diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 8a033d7761a9..0efa4aba2767 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -2,7 +2,7 @@ , pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup , taglib, sqlite , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas -, gst-python, gst_plugins_base, gst-plugins-good, gst-ffmpeg +, gst-python, gst-plugins-base, gst-plugins-good, gst-ffmpeg , enableBonjour ? false, avahi ? null }: @@ -77,7 +77,7 @@ in buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pycurl mutagen pycairo dbus-python pywebkitgtk] ++ [ libtorrentRasterbar - gst-python gst_plugins_base gst-plugins-good gst-ffmpeg + gst-python gst-plugins-base gst-plugins-good gst-ffmpeg ] ++ optional enableBonjour avahi; meta = { |