From c155ee2b7f68c044822968e901082c266ba2de5e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 24 Apr 2023 23:22:08 +0300 Subject: plasma5Packages.kactivities: refactor --- pkgs/development/libraries/kde-frameworks/kio/default.nix | 4 +++- pkgs/development/libraries/kde-frameworks/knotifications.nix | 6 ++++-- pkgs/development/libraries/phonon/default.nix | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 7b2815945c8..3b07654fb80 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -21,7 +21,9 @@ mkDerivation { ]; propagatedBuildInputs = [ kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice - kxmlgui qtbase qttools solid kded + kxmlgui qtbase qttools solid + ] ++ lib.optionals stdenv.isLinux [ + kded ]; outputs = [ "out" "dev" ]; patches = [ diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix index 363ca46d10a..5284d673d89 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix @@ -1,9 +1,9 @@ -{ mkDerivation +{ mkDerivation, lib, stdenv , extra-cmake-modules , kcodecs, kconfig, kcoreaddons, kwindowsystem , libdbusmenu , phonon -, qttools, qtx11extras +, qttools, qtx11extras, qtmacextras }: mkDerivation { @@ -11,5 +11,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras + ] ++ lib.optionals stdenv.isDarwin [ + qtmacextras ]; } diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 48f4729ba16..edfc6c7eded 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { homepage = "https://community.kde.org/Phonon"; description = "Multimedia API for Qt"; license = lib.licenses.lgpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ttuegel ]; + broken = stdenv.isDarwin; }; src = fetchurl { -- cgit 1.4.1