public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gst-plugins-base: align attrname with pkgname

Browse Source
This commit is contained in:
Bjørn Forsman
2017-02-26 21:25:29 +01:00
committed by Robin Gloster
parent c49533a494
commit 3d104ab2b3
40 changed files with 88 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/haskell-modules/hackage-packages.nix
View File

@@ -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

4
pkgs/development/libraries/farsight2/default.nix
View File

@@ -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/;

4
pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
View File

@@ -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";

4
pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
View File

@@ -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 = {

4
pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
View File

@@ -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;

4
pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
View File

@@ -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)

4
pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
View File

@@ -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;

4
pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
View File

@@ -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 ];

4
pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
View File

@@ -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 ];

4
pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
View File

@@ -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 ];

4
pkgs/development/libraries/libcanberra/default.nix
View File

@@ -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";

4
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@@ -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 =

4
pkgs/development/libraries/wxGTK-2.8/default.nix
View File

@@ -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 ];

4
pkgs/development/libraries/wxGTK-2.9/default.nix
View File

@@ -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 ];

4
pkgs/development/libraries/wxGTK-3.0/default.nix
View File

@@ -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 ];