kde4.kdelibs -> kdelibs4

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
+3 -3
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, lib, automoc4, cmake, perl, pkgconfig
, qtscriptgenerator, gettext, curl , libxml2, mysql, taglib
, taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod
, taglib_extras, loudmouth , kdelibs4, qca2, libmtp, liblastfm, libgpod
, phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null
, lz4, lzo, snappy, libaio, pcre
}:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.server/*libmysqld*/
taglib taglib_extras loudmouth kdelibs phonon strigi soprano qca2
taglib taglib_extras loudmouth kdelibs4 phonon strigi soprano qca2
libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
lz4 lzo snappy libaio pcre
];
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
description = "Popular music player for KDE";
license = "GPL";
homepage = http://amarok.kde.org;
inherit (kdelibs.meta) platforms maintainers;
inherit (kdelibs4.meta) platforms;
};
}