qt-gstreamer1: align attrname with pkgname
This commit is contained in:
parent
512bd7c522
commit
c49533a494
@ -1,6 +1,6 @@
|
|||||||
{ stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig
|
{ stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig
|
||||||
, telepathy_qt, kdelibs4, kde_workspace, dbus_glib, dbus_libs, farstream
|
, telepathy_qt, kdelibs4, kde_workspace, dbus_glib, dbus_libs, farstream
|
||||||
, qt_gstreamer1, telepathy_glib, telepathy_logger
|
, qt-gstreamer1, telepathy_glib, telepathy_logger
|
||||||
, qjson, flex, bison, qca2 }:
|
, qjson, flex, bison, qca2 }:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -21,10 +21,10 @@ let
|
|||||||
|
|
||||||
extraBuildInputs = {
|
extraBuildInputs = {
|
||||||
auth_handler = [ qjson qca2 ];
|
auth_handler = [ qjson qca2 ];
|
||||||
call_ui = [ qt_gstreamer1 telepathy_glib farstream ];
|
call_ui = [ qt-gstreamer1 telepathy_glib farstream ];
|
||||||
contact_applet = [ kde_workspace ];
|
contact_applet = [ kde_workspace ];
|
||||||
telepathy_logger_qt = [ telepathy_logger qt_gstreamer1 ];
|
telepathy_logger_qt = [ telepathy_logger qt-gstreamer1 ];
|
||||||
text_ui = [ qt_gstreamer1 telepathy_logger qjson ];
|
text_ui = [ qt-gstreamer1 telepathy_logger qjson ];
|
||||||
common_internals = [ telepathy_qt ];
|
common_internals = [ telepathy_qt ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
|
, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
|
||||||
, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmakeHook
|
, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmakeHook
|
||||||
, makeQtWrapper, lndir
|
, makeQtWrapper, lndir
|
||||||
, gst_all_1, qt_gstreamer1, pkgconfig, glibc
|
, gst_all_1, qt-gstreamer1, pkgconfig, glibc
|
||||||
, version ? "2.9.4"
|
, version ? "2.9.4"
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -99,6 +99,7 @@ doNotDisplayTwice rec {
|
|||||||
qca-qt5 = qt5.qca-qt5; # added 2015-12-19
|
qca-qt5 = qt5.qca-qt5; # added 2015-12-19
|
||||||
QmidiNet = qmidinet; # added 2016-05-22
|
QmidiNet = qmidinet; # added 2016-05-22
|
||||||
qt_gstreamer = qt-gstreamer; # added 2017-02
|
qt_gstreamer = qt-gstreamer; # added 2017-02
|
||||||
|
qt_gstreamer1 = qt-gstreamer1; # added 2017-02
|
||||||
quake3game = ioquake3; # added 2016-01-14
|
quake3game = ioquake3; # added 2016-01-14
|
||||||
qwt6 = qt5.qwt; # added 2015-12-19
|
qwt6 = qt5.qwt; # added 2015-12-19
|
||||||
rdiff_backup = rdiff-backup; # added 2014-11-23
|
rdiff_backup = rdiff-backup; # added 2014-11-23
|
||||||
|
@ -7565,7 +7565,7 @@ with pkgs;
|
|||||||
|
|
||||||
qt-gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
|
qt-gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
|
||||||
|
|
||||||
qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155;};
|
qt-gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155;};
|
||||||
|
|
||||||
gnet = callPackage ../development/libraries/gnet { };
|
gnet = callPackage ../development/libraries/gnet { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user