diff options
| author | K900 <me@0upti.me> | 2024-04-21 21:26:18 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2024-04-29 08:28:45 +0300 |
| commit | 28fabd0ef72451da7fbd1ff47bf9f281bb28e9a9 (patch) | |
| tree | 94e721ecff75fd2f889377521470016417e073f8 /pkgs/kde | |
| parent | 8596068d46e39547f0de0e73b5752bad3e87474a (diff) | |
kdePackages.mkKdeDerivation: move Qt Designer plugins out of $dev
Or they end up picked up by the build hooks
Diffstat (limited to 'pkgs/kde')
| -rw-r--r-- | pkgs/kde/lib/mk-kde-derivation.nix | 2 | ||||
| -rw-r--r-- | pkgs/kde/lib/move-dev-hook.sh | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index 0b2ebd8ace7f7..975d2e4af93ab 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 da5770e1bba14..a49cb91d22f3c 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') |