diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-27 07:05:17 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-04-30 12:20:13 -0500 |
| commit | e5274b2fee37c622aa925e0dda4740581bce3568 (patch) | |
| tree | ef94922e107c518c23065aeb7e7e98dbb7d90235 /pkgs/desktops | |
| parent | 3a948d4786dd1b2fd72eaebee4cd994eacef5da1 (diff) | |
| download | nixpkgs-e5274b2fee37c622aa925e0dda4740581bce3568.tar nixpkgs-e5274b2fee37c622aa925e0dda4740581bce3568.tar.gz nixpkgs-e5274b2fee37c622aa925e0dda4740581bce3568.tar.bz2 nixpkgs-e5274b2fee37c622aa925e0dda4740581bce3568.tar.lz nixpkgs-e5274b2fee37c622aa925e0dda4740581bce3568.tar.xz nixpkgs-e5274b2fee37c622aa925e0dda4740581bce3568.tar.zst nixpkgs-e5274b2fee37c622aa925e0dda4740581bce3568.zip | |
kde5.kdelibs4support: propagate all buildInputs
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix | 32 | ||||
| -rw-r--r-- | pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix | 17 |
2 files changed, 6 insertions, 43 deletions
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix deleted file mode 100644 index e61c4bb86e7..00000000000 --- a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth -, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons -, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons -, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels -, kinit, knotifications, kparts, kservice, ktextwidgets -, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui -, networkmanager, qtsvg, qtx11extras, xlibs -}: - -# TODO: debug docbook detection - -kdeFramework { - name = "kdelibs4support"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcompletion kconfig kded kservice kwidgetsaddons - kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM - ]; - propagatedBuildInputs = [ - kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons - kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio - kiconthemes kitemmodels kinit knotifications kparts ktextwidgets - kunitconversion kwindowsystem - ]; - cmakeFlags = [ - "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" - "-DDocBookXML4_DTD_VERSION=4.5" - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix index 843db83a99b..1765ffa9a39 100644 --- a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix @@ -12,25 +12,20 @@ kdeFramework { name = "kdelibs4support"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; outputs = [ "dev" "out" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcompletion kconfig kded kservice kwidgetsaddons - kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM - ]; propagatedBuildInputs = [ - kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons - kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio - kiconthemes kitemmodels kinit knotifications kparts ktextwidgets - kunitconversion kwindowsystem + kauth karchive kcompletion kconfig kconfigwidgets kcoreaddons kcrash + kdbusaddons kded kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n + kio kiconthemes kitemmodels kinit knotifications kparts kservice + ktextwidgets kunitconversion kwidgetsaddons kwindowsystem kxmlgui + networkmanager qtsvg qtx11extras xlibs.libSM ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_VERSION=4.5" ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } |