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

qt-gstreamer1: align attrname with pkgname

Browse Source
This commit is contained in:
Bjørn Forsman 2017-02-26 20:40:56 +01:00 committed by Robin Gloster
parent 512bd7c522
commit c49533a494
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
View File

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

2
pkgs/applications/science/robotics/qgroundcontrol/default.nix
View File

@ -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"
}:

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

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

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

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