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

kde4.kdelibs -> kdelibs4

Browse Source 
Our kdelibs4 package does not come from KDE 4, so per upstream's request I am
moving it out of the kde4 set.
This commit is contained in:
Thomas Tuegel
2017-02-24 17:16:28 -06:00
parent ea6355f2c5
commit f28848cb4d
17 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig
, telepathy_qt, kdelibs, kde_workspace, dbus_glib, dbus_libs, farstream
, telepathy_qt, kdelibs4, kde_workspace, dbus_glib, dbus_libs, farstream
, qt_gstreamer1, telepathy_glib, telepathy_logger
, qjson, flex, bison, qca2 }:
@@ -48,12 +48,12 @@ let
nativeBuildInputs =
[ automoc4 cmake gettext perl pkgconfig ]
++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs);
buildInputs = [ kdelibs telepathy_qt ]
buildInputs = [ kdelibs4 telepathy_qt ]
++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals
++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs);
meta = {
inherit (kdelibs.meta) platforms;
inherit (kdelibs4.meta) platforms;
maintainers = [ stdenv.lib.maintainers.urkud ];
};
}