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

gst-python: align attrname with pkgname

This commit is contained in:
Bjørn Forsman 2017-02-26 20:30:00 +01:00 committed by Robin Gloster
parent eb073e9cd9
commit 9e21b2c5e9
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/morituri/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, pythonPackages, cdparanoia, cdrdao { 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 }: , utillinux, makeWrapper, substituteAll, autoreconfHook }:
let let
@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
}; };
pythonPath = with pythonPackages; [ pythonPath = with pythonPackages; [
pygobject2 gst_python musicbrainzngs pygobject2 gst-python musicbrainzngs
pycdio pyxdg setuptools pycdio pyxdg setuptools
CDDB CDDB
]; ];

4
pkgs/applications/audio/quodlibet/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python2Packages, intltool { 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 }: , gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }:
assert withGstPlugins -> gst_plugins_base != null assert withGstPlugins -> gst_plugins_base != null
@ -48,7 +48,7 @@ in buildPythonApplication {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
mutagen pygtk pygobject2 dbus-python gst_python intltool mutagen pygtk pygobject2 dbus-python gst-python intltool
]; ];
postInstall = stdenv.lib.optionalString withGstPlugins '' postInstall = stdenv.lib.optionalString withGstPlugins ''

4
pkgs/applications/video/miro/default.nix
View File

@ -2,7 +2,7 @@
, pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup , pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup
, taglib, sqlite , taglib, sqlite
, libtorrentRasterbar, glib_networking, gsettings_desktop_schemas , 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 , enableBonjour ? false, avahi ? null
}: }:
@ -77,7 +77,7 @@ in buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
pygobject2 pygtk pycurl mutagen pycairo dbus-python pygobject2 pygtk pycurl mutagen pycairo dbus-python
pywebkitgtk] ++ [ libtorrentRasterbar 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; ] ++ optional enableBonjour avahi;
meta = { meta = {

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libnice, pkgconfig, python2Packages, gstreamer, gst_plugins_base { stdenv, fetchurl, libnice, pkgconfig, python2Packages, gstreamer, gst_plugins_base
, gst_python, gupnp_igd }: , gst-python, gupnp_igd }:
let let
inherit (python2Packages) python pygobject2; inherit (python2Packages) python pygobject2;
@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
sha256 = "16qz4x14rdycm4nrn5wx6k2y22fzrazsbmihrxdwafx9cyf23kjm"; sha256 = "16qz4x14rdycm4nrn5wx6k2y22fzrazsbmihrxdwafx9cyf23kjm";
}; };
buildInputs = [ libnice python pygobject2 gst_python gupnp_igd ]; buildInputs = [ libnice python pygobject2 gst-python gupnp_igd ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

1
pkgs/top-level/aliases.nix
View File

@ -52,6 +52,7 @@ doNotDisplayTwice rec {
git-hub = gitAndTools.git-hub; # added 2016-04-29 git-hub = gitAndTools.git-hub; # added 2016-04-29
googleAuthenticator = google-authenticator; # added 2016-10-16 googleAuthenticator = google-authenticator; # added 2016-10-16
grantlee5 = qt5.grantlee; # added 2015-12-19 grantlee5 = qt5.grantlee; # added 2015-12-19
gst_python = gst-python; # added 2017-02
gupnptools = gupnp-tools; # added 2015-12-19 gupnptools = gupnp-tools; # added 2015-12-19
gnustep-make = gnustep.make; # added 2016-7-6 gnustep-make = gnustep.make; # added 2016-7-6
htmlTidy = html-tidy; # added 2014-12-06 htmlTidy = html-tidy; # added 2014-12-06

7
pkgs/top-level/all-packages.nix
View File

@ -7518,7 +7518,7 @@ with pkgs;
}); });
gst_all = { gst_all = {
inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer; inherit (pkgs) gstreamer gnonlin gst-python qt_gstreamer;
gstPluginsBase = pkgs.gst_plugins_base; gstPluginsBase = pkgs.gst_plugins_base;
gstPluginsBad = pkgs.gst_plugins_bad; gstPluginsBad = pkgs.gst_plugins_bad;
gstPluginsGood = pkgs.gst_plugins_good; gstPluginsGood = pkgs.gst_plugins_good;
@ -7530,8 +7530,7 @@ with pkgs;
gst-plugins-bad = pkgs.gst_plugins_bad; gst-plugins-bad = pkgs.gst_plugins_bad;
gst-plugins-good = pkgs.gst_plugins_good; gst-plugins-good = pkgs.gst_plugins_good;
gst-plugins-ugly = pkgs.gst_plugins_ugly; gst-plugins-ugly = pkgs.gst_plugins_ugly;
gst-ffmpeg = pkgs.gst_ffmpeg; gst-ffmpeg = pkgs.gst-ffmpeg;
gst-python = pkgs.gst_python;
}; };
gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer {
@ -7552,7 +7551,7 @@ with pkgs;
ffmpeg = ffmpeg_0; ffmpeg = ffmpeg_0;
}; };
gst_python = callPackage ../development/libraries/gstreamer/legacy/gst-python {}; gst-python = callPackage ../development/libraries/gstreamer/legacy/gst-python {};
gstreamermm = callPackage ../development/libraries/gstreamer/legacy/gstreamermm { }; gstreamermm = callPackage ../development/libraries/gstreamer/legacy/gstreamermm { };