summaryrefslogtreecommitdiffstats
path: root/pkgs/development
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2017-02-26 21:25:29 +0100
committerRobin Gloster <mail@glob.in>2017-02-27 12:16:26 +0100
commit3d104ab2b3e578cb4599b6fffbcc019b09547521 (patch)
treeda0852033c00cee83ac2dc46281c307d38ae5259 /pkgs/development
parentc49533a4949b5fc7d3511dce7df4c27f811df4d7 (diff)
gst-plugins-base: align attrname with pkgname
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix24
-rw-r--r--pkgs/development/libraries/farsight2/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix4
-rw-r--r--pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix4
-rw-r--r--pkgs/development/libraries/libcanberra/default.nix4
-rw-r--r--pkgs/development/libraries/qt-4.x/4.8/default.nix4
-rw-r--r--pkgs/development/libraries/wxGTK-2.8/default.nix4
-rw-r--r--pkgs/development/libraries/wxGTK-2.9/default.nix4
-rw-r--r--pkgs/development/libraries/wxGTK-3.0/default.nix4
15 files changed, 40 insertions, 40 deletions
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6feed8f5c987..d31dc82822cb 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -69335,7 +69335,7 @@ self: {
"gi-gstaudio" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
, gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection
- , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers
+ , gst-plugins-base, haskell-gi, haskell-gi-base, text, transformers
}:
mkDerivation {
pname = "gi-gstaudio";
@@ -69347,18 +69347,18 @@ self: {
haskell-gi haskell-gi-base text transformers
];
librarySystemDepends = [ gobjectIntrospection ];
- libraryPkgconfigDepends = [ gst_plugins_base ];
+ libraryPkgconfigDepends = [ gst-plugins-base ];
doHaddock = false;
homepage = "https://github.com/haskell-gi/haskell-gi";
description = "GStreamerAudio bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) gobjectIntrospection;
- gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;};
+ gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
"gi-gstbase" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
- , gi-gobject, gi-gst, gobjectIntrospection, gst_plugins_base
+ , gi-gobject, gi-gst, gobjectIntrospection, gst-plugins-base
, haskell-gi, haskell-gi-base, text, transformers
}:
mkDerivation {
@@ -69371,19 +69371,19 @@ self: {
haskell-gi-base text transformers
];
librarySystemDepends = [ gobjectIntrospection ];
- libraryPkgconfigDepends = [ gst_plugins_base ];
+ libraryPkgconfigDepends = [ gst-plugins-base ];
doHaddock = false;
homepage = "https://github.com/haskell-gi/haskell-gi";
description = "GStreamerBase bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) gobjectIntrospection;
- gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;};
+ gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
"gi-gstvideo" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
, gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection
- , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers
+ , gst-plugins-base, haskell-gi, haskell-gi-base, text, transformers
}:
mkDerivation {
pname = "gi-gstvideo";
@@ -69395,14 +69395,14 @@ self: {
haskell-gi haskell-gi-base text transformers
];
librarySystemDepends = [ gobjectIntrospection ];
- libraryPkgconfigDepends = [ gst_plugins_base ];
+ libraryPkgconfigDepends = [ gst-plugins-base ];
doHaddock = false;
homepage = "https://github.com/haskell-gi/haskell-gi";
description = "GStreamerVideo bindings";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) gobjectIntrospection;
- gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;};
+ gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
"gi-gtk" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -76588,7 +76588,7 @@ self: {
"gstreamer" = callPackage
({ mkDerivation, array, base, bytestring, Cabal, directory, glib
- , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl
+ , gst-plugins-base, gstreamer, gtk2hs-buildtools, mtl
}:
mkDerivation {
pname = "gstreamer";
@@ -76598,11 +76598,11 @@ self: {
libraryHaskellDepends = [
array base bytestring directory glib mtl
];
- libraryPkgconfigDepends = [ gst_plugins_base gstreamer ];
+ libraryPkgconfigDepends = [ gst-plugins-base gstreamer ];
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the GStreamer open source multimedia framework";
license = stdenv.lib.licenses.lgpl21;
- }) {inherit (pkgs) gst_plugins_base; inherit (pkgs) gstreamer;};
+ }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
"gt-tools" = callPackage
({ mkDerivation, base, containers, extensible-exceptions, haskeline
diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix
index da6c799ae8b9..9ff57257e03b 100644
--- a/pkgs/development/libraries/farsight2/default.nix
+++ b/pkgs/development/libraries/farsight2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libnice, pkgconfig, python2Packages, gstreamer, gst_plugins_base
+{ stdenv, fetchurl, libnice, pkgconfig, python2Packages, gstreamer, gst-plugins-base
, gst-python, gupnp_igd }:
let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
- propagatedBuildInputs = [ gstreamer gst_plugins_base ];
+ propagatedBuildInputs = [ gstreamer gst-plugins-base ];
meta = {
homepage = http://farsight.freedesktop.org/wiki/;
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 ];
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 8e3523a27e9f..25be48026992 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap
-, alsaLib, libpulseaudio, gstreamer, gst_plugins_base, libvorbis }:
+, alsaLib, libpulseaudio, gstreamer, gst-plugins-base, libvorbis }:
stdenv.mkDerivation rec {
name = "libcanberra-0.30";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig libtool alsaLib libpulseaudio libvorbis gtk libcap
- /*gstreamer gst_plugins_base*/ # ToDo: gstreamer not found (why?), add (g)udev?
+ /*gstreamer gst-plugins-base*/ # ToDo: gstreamer not found (why?), add (g)udev?
];
configureFlags = "--disable-oss";
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 8c8e311a93ed..0860a90192f0 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -3,7 +3,7 @@
, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
, libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig
, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
-, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst_plugins_base
+, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
, buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
, flashplayerFix ? false, gdk_pixbuf
, gtkStyle ? false, libgnomeui, gtk2, GConf, gnome_vfs
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
# Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used
++ optional mesaSupported mesa_glu
++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib
- ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ];
+ ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst-plugins-base ];
# The following libraries are only used in plugins
buildInputs =
diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix
index 6b9aa4587350..cbfdf876dbaf 100644
--- a/pkgs/development/libraries/wxGTK-2.8/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.8/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, gstreamer, gst_plugins_base, GConf, libX11, cairo
+, gstreamer, gst-plugins-base, GConf, libX11, cairo
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz";
};
- buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf libX11 cairo ]
+ buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ]
++ optional withMesa mesa;
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix
index b2f40978f51b..e19f0bc3a765 100644
--- a/pkgs/development/libraries/wxGTK-2.9/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, gstreamer, gst_plugins_base, GConf, setfile
+, gstreamer, gst-plugins-base, GConf, setfile
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
buildInputs =
[ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
- gst_plugins_base GConf ]
+ gst-plugins-base GConf ]
++ optional withMesa mesa
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix
index ed9372725146..f40595d4eacb 100644
--- a/pkgs/development/libraries/wxGTK-3.0/default.nix
+++ b/pkgs/development/libraries/wxGTK-3.0/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm
-, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile
+, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
, withWebKit ? false, webkitgtk2 ? null
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
buildInputs =
[ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
- gst_plugins_base GConf ]
+ gst-plugins-base GConf ]
++ optional withMesa mesa
++ optional withWebKit webkitgtk2
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];