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

kdelibs: avoid accidental Qt 5 dependency

Browse Source
This commit is contained in:
Thomas Tuegel 2016-07-29 11:17:03 -05:00
parent 2f32588a8f
commit 1d575e4ba8
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/desktops/kde-5/applications/default.nix
View File

@ -25,7 +25,10 @@ let
inherit debug srcs;
};
kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; };
kdelibs = callPackage ./kdelibs {
inherit (srcs.kdelibs) src version;
inherit (pkgs) attica phonon;
};
ark = callPackage ./ark/default.nix {};
baloo-widgets = callPackage ./baloo-widgets.nix {};

25
pkgs/desktops/kde-5/applications/kdelibs/default.nix
View File

@ -1,24 +1,25 @@
{ kdeApp, attica, attr, automoc4, avahi, bison, cmake
, docbook_xml_dtd_42, docbook_xsl, flex, giflib, ilmbase
, libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig
, polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info
, soprano, strigi, udev, xz, pcre
, lib
{
stdenv, lib, src, version
automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,
shared_desktop_ontologies_mime_info, soprano, strigi, udev, xz, pcre
}:
kdeApp {
name = "kdelibs";
stdenv.mkDerivation {
name = "kdelibs-${version}";
inherit src;
outputs = [ "out" ];
nativeBuildInputs = [
automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info
];
buildInputs = [
attica attr avahi giflib libdbusmenu_qt libjpeg libxml2
polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre
];
propagatedBuildInputs = [ qt4 soprano phonon strigi ];
nativeBuildInputs = [
automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info
];
patches = [
./0001-old-kde4-cmake-policies.patch
@ -39,6 +40,8 @@ kdeApp {
setupHook = ./setup-hook.sh;
meta = {
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};