diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-02-26 20:40:56 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-02-27 12:16:26 +0100 |
| commit | c49533a4949b5fc7d3511dce7df4c27f811df4d7 (patch) | |
| tree | b0204accfd57062ca863b8eee40fb37ce4d2a547 /pkgs | |
| parent | 512bd7c52248b7a7a10d256c3ac68bd3aa9fc9ec (diff) | |
| download | nixlib-c49533a4949b5fc7d3511dce7df4c27f811df4d7.tar nixlib-c49533a4949b5fc7d3511dce7df4c27f811df4d7.tar.gz nixlib-c49533a4949b5fc7d3511dce7df4c27f811df4d7.tar.bz2 nixlib-c49533a4949b5fc7d3511dce7df4c27f811df4d7.tar.lz nixlib-c49533a4949b5fc7d3511dce7df4c27f811df4d7.tar.xz nixlib-c49533a4949b5fc7d3511dce7df4c27f811df4d7.tar.zst nixlib-c49533a4949b5fc7d3511dce7df4c27f811df4d7.zip | |
qt-gstreamer1: align attrname with pkgname
Diffstat (limited to 'pkgs')
4 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index c79f939dc73c..592fc2b5934d 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig , 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 }: let @@ -21,10 +21,10 @@ let extraBuildInputs = { auth_handler = [ qjson qca2 ]; - call_ui = [ qt_gstreamer1 telepathy_glib farstream ]; + call_ui = [ qt-gstreamer1 telepathy_glib farstream ]; contact_applet = [ kde_workspace ]; - telepathy_logger_qt = [ telepathy_logger qt_gstreamer1 ]; - text_ui = [ qt_gstreamer1 telepathy_logger qjson ]; + telepathy_logger_qt = [ telepathy_logger qt-gstreamer1 ]; + text_ui = [ qt-gstreamer1 telepathy_logger qjson ]; common_internals = [ telepathy_qt ]; }; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 4222336fe9b2..98567c340bc4 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -2,7 +2,7 @@ , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmakeHook , makeQtWrapper, lndir - , gst_all_1, qt_gstreamer1, pkgconfig, glibc + , gst_all_1, qt-gstreamer1, pkgconfig, glibc , version ? "2.9.4" }: diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cf30289a126d..efeb14eb4174 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -99,6 +99,7 @@ doNotDisplayTwice rec { qca-qt5 = qt5.qca-qt5; # added 2015-12-19 QmidiNet = qmidinet; # added 2016-05-22 qt_gstreamer = qt-gstreamer; # added 2017-02 + qt_gstreamer1 = qt-gstreamer1; # added 2017-02 quake3game = ioquake3; # added 2016-01-14 qwt6 = qt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 028068a95440..acd872768a2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7565,7 +7565,7 @@ with pkgs; 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 { }; |