mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

kdoctools: Perl is a propagated *run*-time dep

Browse source 
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.
This commit is contained in:
John Ericson 2017-12-24 18:26:27 -05:00
parent 469fd89832
commit e9a369b2c6
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/kde/libkcddb.nix
View file

@ -8,8 +8,8 @@ mkDerivation {
license = with licenses; [ gpl2 lgpl21 bsd3 ]; license = with licenses; [ gpl2 lgpl21 bsd3 ];
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
}; };
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ qtbase kdoctools ]; buildInputs = [ qtbase ];
propagatedBuildInputs = [ propagatedBuildInputs = [
kcodecs ki18n kio kwidgetsaddons kcodecs ki18n kio kwidgetsaddons
libmusicbrainz5 libmusicbrainz5

7
pkgs/applications/office/skrooge/default.nix
View file

@ -14,9 +14,12 @@ mkDerivation rec {
sha256 = "1dbvdrkdpgv39v8h7k3mri0nzlslfyd5kk410czj0jdn4qq400md"; 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 kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx
]; ];

14
pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
View file

@ -8,10 +8,18 @@
mkDerivation { mkDerivation {
name = "kdoctools"; name = "kdoctools";
meta = { maintainers = [ lib.maintainers.ttuegel ]; }; meta = { maintainers = [ lib.maintainers.ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [
propagatedNativeBuildInputs = [ perl perlPackages.URI ]; 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 ]; buildInputs = [ karchive ki18n ];
propagatedBuildInputs = [ qtbase ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
patches = [ ./kdoctools-no-find-docbook-xml.patch ]; patches = [ ./kdoctools-no-find-docbook-xml.patch ];
cmakeFlags = [ cmakeFlags = [