JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 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
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
17 changed files with 40 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/audio/amarok/default.nix
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;
};
}

6
pkgs/applications/audio/tomahawk/default.nix
View File

@ -3,12 +3,12 @@
, qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper
, enableXMPP ? true, libjreen ? null
, enableKDE ? false, kdelibs ? null
, enableKDE ? false, kdelibs4 ? null
, enableTelepathy ? false, telepathy_qt ? null
}:
assert enableXMPP -> libjreen != null;
assert enableKDE -> kdelibs != null;
assert enableKDE -> kdelibs4 != null;
assert enableTelepathy -> telepathy_qt != null;
stdenv.mkDerivation rec {
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp
makeWrapper
] ++ stdenv.lib.optional enableXMPP libjreen
++ stdenv.lib.optional enableKDE kdelibs
++ stdenv.lib.optional enableKDE kdelibs4
++ stdenv.lib.optional enableTelepathy telepathy_qt;
postInstall = let

4
pkgs/applications/graphics/kgraphviewer/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs, boost, graphviz
, kdelibs4, boost, graphviz
}:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "13zhjs57xavzrj4nrlqs35n35ihvzij7hgbszf5fhlp2a4d4rrqs";
};
buildInputs = [ kdelibs boost graphviz ];
buildInputs = [ kdelibs4 boost graphviz ];
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
meta = with stdenv.lib; {

2
pkgs/applications/misc/dfilemanager/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation {
meta = {
homepage = "http://dfilemanager.sourceforge.net/";
description = "File manager written in Qt/C++, it does use one library from kdelibs, the solid lib for easy device handling";
description = "File manager written in Qt/C++";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.eduarrrd ];

4
pkgs/applications/misc/k3b/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig
, shared_mime_info, libvorbis, taglib, flac, libsamplerate
, libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao
, dvdplusrwtools, vcdimager, cdparanoia, kdelibs, libdvdcss, ffmpeg
, dvdplusrwtools, vcdimager, cdparanoia, kdelibs4, libdvdcss, ffmpeg
, libkcddb, phonon
}:
@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
shared_mime_info libvorbis taglib flac libsamplerate libdvdread
lame libsndfile libmad stdenv.cc.libc kdelibs
lame libsndfile libmad stdenv.cc.libc kdelibs4
phonon libkcddb makeWrapper cdparanoia
libdvdcss ffmpeg
];

4
pkgs/applications/misc/kgocode/default.nix
View File

@ -1,9 +1,9 @@
{ fetchgit, stdenv, cmake, kdelibs, automoc4 } :
{ fetchgit, stdenv, cmake, kdelibs4, automoc4 } :
stdenv.mkDerivation rec {
name = "kgocode-0.0.1";
buildInputs = [ cmake kdelibs automoc4 ];
buildInputs = [ cmake kdelibs4 automoc4 ];
src = fetchgit {
url = https://bitbucket.org/lucashnegri/kgocode.git;

6
pkgs/applications/misc/krusader/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs, kde_baseapps
, kdelibs4, kde_baseapps
}:
stdenv.mkDerivation rec {
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/krusader/${name}.tar.bz2";
sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6";
};
buildInputs = [ kdelibs kde_baseapps ];
buildInputs = [ kdelibs4 kde_baseapps ];
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
meta = {
@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
license = "GPL";
homepage = http://www.krusader.org;
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
inherit (kdelibs.meta) platforms;
inherit (kdelibs4.meta) platforms;
};
}

6
pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
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 ];
};
}

6
pkgs/applications/office/calligra/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, lcms2, libpng, eigen
{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen
, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];
buildInputs = [
kdelibs lcms2 libpng eigen
kdelibs4 lcms2 libpng eigen
exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
freetds fftw glew libkdcraw opencolorio kdepimlibs
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://calligra.org;
maintainers = with maintainers; [ urkud phreedom ebzzry ];
inherit (kdelibs.meta) platforms;
inherit (kdelibs4.meta) platforms;
license = licenses.gpl2;
};
}

4
pkgs/applications/office/libreoffice/default.nix
View File

@ -6,7 +6,7 @@
, openssl, gperf, cppunit, GConf, ORBit2, poppler
, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
@ -252,7 +252,7 @@ in stdenv.mkDerivation rec {
libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
gdb
]
++ lib.optional kdeIntegration kde4.kdelibs;
++ lib.optional kdeIntegration kdelibs4;
passthru = {
inherit srcs;

4
pkgs/applications/office/libreoffice/still.nix
View File

@ -6,7 +6,7 @@
, openssl, gperf, cppunit, GConf, ORBit2, poppler
, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
, libwpg, dbus_glib, glibc, qt4, kdelibs4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
, fontsConf, pkgconfig, libzip, bluez5, libtool, maven
, libatomic_ops, graphite2, harfbuzz, libodfgen
@ -247,7 +247,7 @@ in stdenv.mkDerivation rec {
librevenge libe-book libmwaw glm glew ncurses
libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
]
++ lib.optional kdeIntegration kde4.kdelibs;
++ lib.optional kdeIntegration kdelibs4;
passthru = {
inherit srcs;

6
pkgs/applications/office/zanshin/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
, kdelibs, kdepimlibs, boost, baloo }:
, kdelibs4, kdepimlibs, boost, baloo }:
stdenv.mkDerivation rec {
name = "zanshin-0.3.1";
@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
buildInputs = [ kdelibs kdepimlibs boost baloo ];
buildInputs = [ kdelibs4 kdepimlibs boost baloo ];
meta = {
description = "GTD for KDE";
maintainers = [ stdenv.lib.maintainers.urkud ];
inherit (kdelibs.meta) platforms;
inherit (kdelibs4.meta) platforms;
};
}

4
pkgs/applications/video/kmplayer/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl
, automoc4, cmake, gettext, makeWrapper, perl, pkgconfig
, kdelibs, cairo, dbus_glib, mplayer
, kdelibs4, cairo, dbus_glib, mplayer
}:
stdenv.mkDerivation {
@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky";
};
buildInputs = [ kdelibs cairo dbus_glib ];
buildInputs = [ kdelibs4 cairo dbus_glib ];
nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ];

2
pkgs/desktops/kde-4.14/default.nix
View File

@ -25,8 +25,6 @@ in
kde.modules // kde.individual //
{
inherit kdelibs;
akonadi = callPackage ./support/akonadi { };
inherit release;

4
pkgs/development/tools/analysis/massif-visualizer/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs, kgraphviewer }:
, kdelibs4, kgraphviewer }:
stdenv.mkDerivation rec {
name = "massif-visualizer-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
buildInputs = [ kdelibs kgraphviewer ];
buildInputs = [ kdelibs4 kgraphviewer ];
meta = with stdenv.lib; {
description = "Tool that visualizes massif data generated by valgrind";

4
pkgs/tools/inputmethods/uim/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, ncurses,
{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs4, ncurses,
cmake, anthy, automoc4, m17n_lib, m17n_db}:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
qt4
gtk2
gtk3
kdelibs
kdelibs4
ncurses
cmake
anthy

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

@ -7829,6 +7829,8 @@ with pkgs;
judy = callPackage ../development/libraries/judy { };
kdelibs4 = kde5.applications.kdelibs;
keybinder = callPackage ../development/libraries/keybinder {
automake = automake111x;
lua = lua5_1;
@ -11697,9 +11699,7 @@ with pkgs;
gocode = callPackage ../development/tools/gocode { };
kgocode = callPackage ../applications/misc/kgocode {
inherit (pkgs.kde4) kdelibs;
};
kgocode = callPackage ../applications/misc/kgocode { };
gotags = callPackage ../development/tools/gotags { };
@ -14002,7 +14002,7 @@ with pkgs;
qt = qt4;
};
kile = kde5.callPackage ../applications/editors/kile/frameworks.nix { };
kile = kde5.callPackage ../applications/editors/kile { };
kino = callPackage ../applications/video/kino {
inherit (gnome2) libglade;
@ -15373,7 +15373,6 @@ with pkgs;
todo-txt-cli = callPackage ../applications/office/todo.txt-cli { };
tomahawk = callPackage ../applications/audio/tomahawk {
inherit (pkgs.kde4) kdelibs;
taglib = taglib_1_9;
enableXMPP = config.tomahawk.enableXMPP or true;
enableKDE = config.tomahawk.enableKDE or false;
@ -16675,7 +16674,7 @@ with pkgs;
libusb = libusb1;
python2Packages = python2Packages;
inherit (python2Packages) python;
kdelibs = kde5.kdelibs;
kdelibs = kdelibs4;
boost = boost155;
subversionClient = subversion18.override {
bdbSupport = false;
@ -16711,8 +16710,6 @@ with pkgs;
kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };
kile = callPackage ../applications/editors/kile { };
kmplayer = callPackage ../applications/video/kmplayer { };
ktikz = callPackage ../applications/graphics/ktikz { };