diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-30 13:24:52 +0200 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-30 13:24:52 +0200 |
| commit | 23cbc3c2b332ecaed3f3a3c5856279a3c7b9be99 (patch) | |
| tree | 55b3ff83683ff8a4b9127c41af96a08efb77bb65 /pkgs/kde | |
| parent | 6fecc628f91a59edecd5775881e14944d98084c6 (diff) | |
| parent | 8f27ccd790e5c4446b63dec50db31adc0d93de78 (diff) | |
| download | nixlib-23cbc3c2b332ecaed3f3a3c5856279a3c7b9be99.tar nixlib-23cbc3c2b332ecaed3f3a3c5856279a3c7b9be99.tar.gz nixlib-23cbc3c2b332ecaed3f3a3c5856279a3c7b9be99.tar.bz2 nixlib-23cbc3c2b332ecaed3f3a3c5856279a3c7b9be99.tar.lz nixlib-23cbc3c2b332ecaed3f3a3c5856279a3c7b9be99.tar.xz nixlib-23cbc3c2b332ecaed3f3a3c5856279a3c7b9be99.tar.zst nixlib-23cbc3c2b332ecaed3f3a3c5856279a3c7b9be99.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/kde')
| -rw-r--r-- | pkgs/kde/frameworks/kdoctools/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/kde/lib/mk-kde-derivation.nix | 2 | ||||
| -rw-r--r-- | pkgs/kde/lib/move-dev-hook.sh | 5 | ||||
| -rw-r--r-- | pkgs/kde/misc/mpvqt/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/kde/plasma/breeze-grub/default.nix | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/kde/frameworks/kdoctools/default.nix b/pkgs/kde/frameworks/kdoctools/default.nix index 8e8341997a2b..996e75c88538 100644 --- a/pkgs/kde/frameworks/kdoctools/default.nix +++ b/pkgs/kde/frameworks/kdoctools/default.nix @@ -8,9 +8,6 @@ mkKdeDerivation { pname = "kdoctools"; - # lots of self-references, the output is pretty small (~5MB), not worth trying to untangle - outputs = ["out"]; - # Perl could be used both at build time and at runtime. extraNativeBuildInputs = [perl perlPackages.URI]; extraBuildInputs = [docbook_xml_dtd_45 docbook-xsl-nons]; diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index 0b2ebd8ace7f..975d2e4af93a 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -91,7 +91,7 @@ in defaultArgs = { inherit version src; - outputs = ["out" "dev"]; + outputs = ["out" "dev" "devtools"]; nativeBuildInputs = [cmake qt6.wrapQtAppsHook moveDevHook] ++ extraNativeBuildInputs; buildInputs = [qt6.qtbase] ++ extraBuildInputs; diff --git a/pkgs/kde/lib/move-dev-hook.sh b/pkgs/kde/lib/move-dev-hook.sh index da5770e1bba1..a49cb91d22f3 100644 --- a/pkgs/kde/lib/move-dev-hook.sh +++ b/pkgs/kde/lib/move-dev-hook.sh @@ -2,7 +2,10 @@ # shellcheck disable=SC2154 moveKF6DevTools() { - moveToOutput "${qtPluginPrefix}/designer" "${!outputDev}" + if [ -n "$devtools" ]; then + mkdir -p "$devtools" + moveToOutput "${qtPluginPrefix}/designer" "$devtools" + fi } postInstallHooks+=('moveKF6DevTools') diff --git a/pkgs/kde/misc/mpvqt/default.nix b/pkgs/kde/misc/mpvqt/default.nix index 4ec52aba0793..fc237f97a803 100644 --- a/pkgs/kde/misc/mpvqt/default.nix +++ b/pkgs/kde/misc/mpvqt/default.nix @@ -17,7 +17,8 @@ mkKdeDerivation rec { hash = "sha256-XHiCxH7dJxJamloM2SJbiFHDt8j4rVfv/M9PaBzvgM4="; }; - extraBuildInputs = [mpv qtdeclarative]; + extraBuildInputs = [qtdeclarative]; + extraPropagatedBuildInputs = [mpv]; meta.license = with lib.licenses; [bsd2 bsd3 cc-by-sa-40 cc0 lgpl21Only lgpl3Only lgpl3Plus mit]; } diff --git a/pkgs/kde/plasma/breeze-grub/default.nix b/pkgs/kde/plasma/breeze-grub/default.nix index a5fe01b4cad7..5dd3d199e44a 100644 --- a/pkgs/kde/plasma/breeze-grub/default.nix +++ b/pkgs/kde/plasma/breeze-grub/default.nix @@ -6,6 +6,8 @@ mkKdeDerivation { nativeBuildInputs = []; buildInputs = []; + outputs = ["out"]; + installPhase = '' runHook preInstall |