summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-12-24 18:26:27 -0500
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-12-30 22:04:23 -0500
commite9a369b2c6f9a6c8d81ae3a0ca35bf12fd239f38 (patch)
tree98262e1ac9fd089ac37046cb1fd28c0e2746452b
parent469fd8983276d851c19827cd9e78a89dd53a5914 (diff)
kdoctools: Perl is a propagated *run*-time dep
It was improperly classified a build-time dep to get around the incorrect propagation logic that was in place before this PR. Additionally fix some `kdoctools` usage were it is incorrectly used a run-time dep.
-rw-r--r--pkgs/applications/kde/libkcddb.nix4
-rw-r--r--pkgs/applications/office/skrooge/default.nix7
-rw-r--r--pkgs/development/libraries/kde-frameworks/kdoctools/default.nix14
3 files changed, 18 insertions, 7 deletions
diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix
index edd9732d051b..3fd486056542 100644
--- a/pkgs/applications/kde/libkcddb.nix
+++ b/pkgs/applications/kde/libkcddb.nix
@@ -8,8 +8,8 @@ mkDerivation {
license = with licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = with maintainers; [ peterhoeg ];
};
- nativeBuildInputs = [ extra-cmake-modules ];
- buildInputs = [ qtbase kdoctools ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ qtbase ];
propagatedBuildInputs = [
kcodecs ki18n kio kwidgetsaddons
libmusicbrainz5
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index f88cc1470981..1aaf05a123e1 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -14,9 +14,12 @@ mkDerivation rec {
sha256 = "1dbvdrkdpgv39v8h7k3mri0nzlslfyd5kk410czj0jdn4qq400md";
};
- nativeBuildInputs = [ cmake extra-cmake-modules shared_mime_info ];
+ nativeBuildInputs = [
+ cmake extra-cmake-modules kdoctools shared_mime_info
+ ];
- buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools
+ buildInputs = [
+ qtwebkit qtscript grantlee kxmlgui kwallet kparts
kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx
];
diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
index 661e89e30782..0a600fe8d057 100644
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
@@ -8,10 +8,18 @@
mkDerivation {
name = "kdoctools";
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
- nativeBuildInputs = [ extra-cmake-modules ];
- propagatedNativeBuildInputs = [ perl perlPackages.URI ];
+ nativeBuildInputs = [
+ extra-cmake-modules
+ # The build system insists on having native Perl.
+ perl perlPackages.URI
+ ];
+ propagatedBuildInputs = [
+ # kdoctools at runtime actually needs Perl for the platform kdoctools is
+ # running on, not necessarily native perl.
+ perl perlPackages.URI
+ qtbase
+ ];
buildInputs = [ karchive ki18n ];
- propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ];
patches = [ ./kdoctools-no-find-docbook-xml.patch ];
cmakeFlags = [