diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 512b084a0bf5..8d2fad7cf9da 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -10,6 +10,7 @@ qtModule { pname = "qtwayland"; propagatedBuildInputs = [ qtbase qtdeclarative ]; + propagatedNativeBuildInputs = [ wayland ]; buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/kde/frameworks/kcodecs/default.nix b/pkgs/kde/frameworks/kcodecs/default.nix index 409666658ddf..be9126712055 100644 --- a/pkgs/kde/frameworks/kcodecs/default.nix +++ b/pkgs/kde/frameworks/kcodecs/default.nix @@ -6,6 +6,5 @@ mkKdeDerivation { pname = "kcodecs"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [gperf]; + extraNativeBuildInputs = [qttools gperf]; } diff --git a/pkgs/kde/frameworks/kdoctools/default.nix b/pkgs/kde/frameworks/kdoctools/default.nix index 996e75c88538..2de9ed21d9c8 100644 --- a/pkgs/kde/frameworks/kdoctools/default.nix +++ b/pkgs/kde/frameworks/kdoctools/default.nix @@ -4,12 +4,13 @@ docbook-xsl-nons, perl, perlPackages, + libxml2, }: mkKdeDerivation { pname = "kdoctools"; # Perl could be used both at build time and at runtime. - extraNativeBuildInputs = [perl perlPackages.URI]; + extraNativeBuildInputs = [perl perlPackages.URI libxml2]; extraBuildInputs = [docbook_xml_dtd_45 docbook-xsl-nons]; extraPropagatedBuildInputs = [perl perlPackages.URI]; } diff --git a/pkgs/kde/frameworks/ki18n/default.nix b/pkgs/kde/frameworks/ki18n/default.nix index 02b03f875ffb..9c3bef785298 100644 --- a/pkgs/kde/frameworks/ki18n/default.nix +++ b/pkgs/kde/frameworks/ki18n/default.nix @@ -2,9 +2,12 @@ mkKdeDerivation, qtdeclarative, python3, + gettext, }: mkKdeDerivation { pname = "ki18n"; - extraBuildInputs = [qtdeclarative python3]; + extraNativeBuildInputs = [python3]; + propagatedNativeBuildInputs = [gettext]; + extraBuildInputs = [qtdeclarative]; } diff --git a/pkgs/kde/gear/akonadi-mime/default.nix b/pkgs/kde/gear/akonadi-mime/default.nix index 8796f7220134..9db5272e6b4b 100644 --- a/pkgs/kde/gear/akonadi-mime/default.nix +++ b/pkgs/kde/gear/akonadi-mime/default.nix @@ -1,9 +1,10 @@ { mkKdeDerivation, shared-mime-info, + libxslt, }: mkKdeDerivation { pname = "akonadi-mime"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [shared-mime-info libxslt]; } diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix index 059ed9456f18..35ce1d590af7 100644 --- a/pkgs/kde/gear/kdenlive/default.nix +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -26,6 +26,8 @@ mkKdeDerivation { ) ]; + extraNativeBuildInputs = [ shared-mime-info ]; + extraBuildInputs = [ qtsvg qtmultimedia @@ -34,7 +36,6 @@ mkKdeDerivation { qqc2-desktop-style mlt - shared-mime-info libv4l glaxnimate ]; diff --git a/pkgs/kde/gear/kdepim-runtime/default.nix b/pkgs/kde/gear/kdepim-runtime/default.nix index bbbe74e07fdb..5937f43822e8 100644 --- a/pkgs/kde/gear/kdepim-runtime/default.nix +++ b/pkgs/kde/gear/kdepim-runtime/default.nix @@ -6,12 +6,13 @@ qtwebengine, cyrus_sasl, lib, - libkgapi + libkgapi, + libxslt, }: mkKdeDerivation { pname = "kdepim-runtime"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [shared-mime-info libxslt]; # FIXME: libkolabxml, libetebase extraBuildInputs = [qtnetworkauth qtspeech qtwebengine cyrus_sasl]; diff --git a/pkgs/kde/gear/knotes/default.nix b/pkgs/kde/gear/knotes/default.nix index bca10fcf13da..913e7a8b85b4 100644 --- a/pkgs/kde/gear/knotes/default.nix +++ b/pkgs/kde/gear/knotes/default.nix @@ -1,4 +1,9 @@ -{mkKdeDerivation}: +{ + mkKdeDerivation, + libxslt, +}: mkKdeDerivation { pname = "knotes"; + + extraNativeBuildInputs = [libxslt]; } diff --git a/pkgs/kde/gear/konversation/default.nix b/pkgs/kde/gear/konversation/default.nix index 952b98fff649..ba58215e3093 100644 --- a/pkgs/kde/gear/konversation/default.nix +++ b/pkgs/kde/gear/konversation/default.nix @@ -7,6 +7,8 @@ mkKdeDerivation { pname = "konversation"; - extraBuildInputs = [qtmultimedia qt5compat qttools]; + extraBuildInputs = [qt5compat]; + extraNativeBuildInputs = [qtmultimedia qttools]; + meta.mainProgram = "konversation"; } diff --git a/pkgs/kde/gear/mailcommon/default.nix b/pkgs/kde/gear/mailcommon/default.nix index 44b2b283896e..a82e6adb266c 100644 --- a/pkgs/kde/gear/mailcommon/default.nix +++ b/pkgs/kde/gear/mailcommon/default.nix @@ -2,9 +2,11 @@ mkKdeDerivation, qtwebengine, qttools, + libxslt, }: mkKdeDerivation { pname = "mailcommon"; + extraNativeBuildInputs = [libxslt]; extraBuildInputs = [qtwebengine qttools]; } diff --git a/pkgs/kde/gear/pimcommon/default.nix b/pkgs/kde/gear/pimcommon/default.nix index ddb467638c65..9ef947dde6fe 100644 --- a/pkgs/kde/gear/pimcommon/default.nix +++ b/pkgs/kde/gear/pimcommon/default.nix @@ -1,9 +1,11 @@ { mkKdeDerivation, qttools, + libxslt, }: mkKdeDerivation { pname = "pimcommon"; extraBuildInputs = [qttools]; + extraNativeBuildInputs = [libxslt]; } diff --git a/pkgs/kde/plasma/kscreenlocker/default.nix b/pkgs/kde/plasma/kscreenlocker/default.nix index e7ee0a18b8e5..f7321990f0c3 100644 --- a/pkgs/kde/plasma/kscreenlocker/default.nix +++ b/pkgs/kde/plasma/kscreenlocker/default.nix @@ -1,10 +1,12 @@ { mkKdeDerivation, pam, + wayland, qqc2-breeze-style, }: mkKdeDerivation { pname = "kscreenlocker"; + extraNativeBuildInputs = [wayland]; extraBuildInputs = [pam qqc2-breeze-style]; } diff --git a/pkgs/kde/plasma/libkscreen/default.nix b/pkgs/kde/plasma/libkscreen/default.nix index 7f7e5d488d9f..ccd11318e2be 100644 --- a/pkgs/kde/plasma/libkscreen/default.nix +++ b/pkgs/kde/plasma/libkscreen/default.nix @@ -3,11 +3,12 @@ qtwayland, qttools, jq, + wayland, }: mkKdeDerivation { pname = "libkscreen"; - extraNativeBuildInputs = [qttools qtwayland jq]; + extraNativeBuildInputs = [qttools qtwayland jq wayland]; extraBuildInputs = [qtwayland]; meta.mainProgram = "kscreen-doctor"; }