diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-24 18:26:27 -0500 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-30 22:04:23 -0500 |
commit | e9a369b2c6f9a6c8d81ae3a0ca35bf12fd239f38 (patch) | |
tree | 98262e1ac9fd089ac37046cb1fd28c0e2746452b /pkgs/development/libraries | |
parent | 469fd8983276d851c19827cd9e78a89dd53a5914 (diff) | |
download | nixlib-e9a369b2c6f9a6c8d81ae3a0ca35bf12fd239f38.tar nixlib-e9a369b2c6f9a6c8d81ae3a0ca35bf12fd239f38.tar.gz nixlib-e9a369b2c6f9a6c8d81ae3a0ca35bf12fd239f38.tar.bz2 nixlib-e9a369b2c6f9a6c8d81ae3a0ca35bf12fd239f38.tar.lz nixlib-e9a369b2c6f9a6c8d81ae3a0ca35bf12fd239f38.tar.xz nixlib-e9a369b2c6f9a6c8d81ae3a0ca35bf12fd239f38.tar.zst nixlib-e9a369b2c6f9a6c8d81ae3a0ca35bf12fd239f38.zip |
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.
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdoctools/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
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 = [ |