diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix index 0ab0d24c2726..44d10957ca64 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 @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { }; pythonPath = with pythonPackages; [ - pygobject2 gst_python musicbrainzngs + pygobject2 gst-python musicbrainzngs pycdio pyxdg setuptools CDDB ]; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 0546f9a0ad2e..1c6bd7783eb4 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,5 +1,5 @@ { 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 @@ -48,7 +48,7 @@ in buildPythonApplication { ]; propagatedBuildInputs = [ - mutagen pygtk pygobject2 dbus-python gst_python intltool + mutagen pygtk pygobject2 dbus-python gst-python intltool ]; postInstall = stdenv.lib.optionalString withGstPlugins '' diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 0652ac7e6642..b0a793dc1056 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 = { diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix index b7a17c82bebd..da6c799ae8b9 100644 --- a/pkgs/development/libraries/farsight2/default.nix +++ b/pkgs/development/libraries/farsight2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libnice, pkgconfig, python2Packages, gstreamer, gst_plugins_base -, gst_python, gupnp_igd }: +, gst-python, gupnp_igd }: let inherit (python2Packages) python pygobject2; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { sha256 = "16qz4x14rdycm4nrn5wx6k2y22fzrazsbmihrxdwafx9cyf23kjm"; }; - buildInputs = [ libnice python pygobject2 gst_python gupnp_igd ]; + buildInputs = [ libnice python pygobject2 gst-python gupnp_igd ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 841eb75e905f..97a93c17ac43 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -52,6 +52,7 @@ doNotDisplayTwice rec { git-hub = gitAndTools.git-hub; # added 2016-04-29 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = qt5.grantlee; # added 2015-12-19 + gst_python = gst-python; # added 2017-02 gupnptools = gupnp-tools; # added 2015-12-19 gnustep-make = gnustep.make; # added 2016-7-6 htmlTidy = html-tidy; # added 2014-12-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6de7c892d879..bdc712153763 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7518,7 +7518,7 @@ with pkgs; }); gst_all = { - inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer; + inherit (pkgs) gstreamer gnonlin gst-python qt_gstreamer; gstPluginsBase = pkgs.gst_plugins_base; gstPluginsBad = pkgs.gst_plugins_bad; gstPluginsGood = pkgs.gst_plugins_good; @@ -7530,8 +7530,7 @@ with pkgs; gst-plugins-bad = pkgs.gst_plugins_bad; gst-plugins-good = pkgs.gst_plugins_good; gst-plugins-ugly = pkgs.gst_plugins_ugly; - gst-ffmpeg = pkgs.gst_ffmpeg; - gst-python = pkgs.gst_python; + gst-ffmpeg = pkgs.gst-ffmpeg; }; gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer { @@ -7552,7 +7551,7 @@ with pkgs; 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 { };