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

kdelibs: avoid accidental Qt 5 dependency

Browse Source
This commit is contained in:
Thomas Tuegel
2016-07-29 11:29:23 -05:00
parent 2f32588a8f
commit 1d575e4ba8
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/kde-5/applications/default.nix
+4 -1
View File
@@ -25,7 +25,10 @@ let
inherit debug srcs; 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 {}; ark = callPackage ./ark/default.nix {};
baloo-widgets = callPackage ./baloo-widgets.nix {}; baloo-widgets = callPackage ./baloo-widgets.nix {};
pkgs/desktops/kde-5/applications/kdelibs/default.nix
+14 -11
View File
@@ -1,24 +1,25 @@
{ kdeApp, attica, attr, automoc4, avahi, bison, cmake {
, docbook_xml_dtd_42, docbook_xsl, flex, giflib, ilmbase stdenv, lib, src, version
, libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
, polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
, soprano, strigi, udev, xz, pcre libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,
, lib shared_desktop_ontologies_mime_info, soprano, strigi, udev, xz, pcre
}: }:
kdeApp { stdenv.mkDerivation {
name = "kdelibs"; name = "kdelibs-${version}";
inherit src;
outputs = [ "out" ]; outputs = [ "out" ];
nativeBuildInputs = [
automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info
];
buildInputs = [ buildInputs = [
attica attr avahi giflib libdbusmenu_qt libjpeg libxml2 attica attr avahi giflib libdbusmenu_qt libjpeg libxml2
polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre
]; ];
propagatedBuildInputs = [ qt4 soprano phonon strigi ]; propagatedBuildInputs = [ qt4 soprano phonon strigi ];
nativeBuildInputs = [
automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info
];
patches = [ patches = [
./0001-old-kde4-cmake-policies.patch ./0001-old-kde4-cmake-policies.patch
@@ -39,6 +40,8 @@ kdeApp {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
meta = { meta = {
platforms = lib.platforms.linux;
homepage = "http://www.kde.org";
licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ]; licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };