From 845ed6342efc552afd6b58d7b4cb37868b5173fa Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 20 Apr 2023 18:00:47 +0300 Subject: [PATCH 1/4] plasma5Packages.kcoreaddons: add darwin support --- pkgs/development/libraries/kde-frameworks/kcoreaddons.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index fbd671099465..3e0eeec617b6 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, stdenv, extra-cmake-modules, qtbase, qttools, shared-mime-info }: @@ -18,4 +18,7 @@ mkDerivation ({ postInstall = '' moveToOutput "mkspecs" "$dev" ''; +} // lib.optionalAttrs stdenv.isDarwin { + # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/327 + env.NIX_CFLAGS_COMPILE = "-DSOCK_CLOEXEC=0"; }) From 8902dfbe468700847ce8bcd7b6c0e3ee79843e20 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 20 Apr 2023 18:52:50 +0300 Subject: [PATCH 2/4] plasma5Packages.qqc2-desktop-style: add darwin support --- .../libraries/kde-frameworks/kauth/default.nix | 4 ++-- .../libraries/kde-frameworks/kdoctools/default.nix | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index f5ab518ce621..0ad7cfbbb7e1 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,7 +1,7 @@ { - lib, mkDerivation, propagate, + lib, stdenv, mkDerivation, propagate, extra-cmake-modules, kcoreaddons, qttools, - enablePolkit ? true, polkit-qt + enablePolkit ? stdenv.isLinux, polkit-qt }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 83f3a04ee36a..4b52cd95b710 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, lib, stdenv, fetchpatch, extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns, karchive, ki18n, qtbase, perl, perlPackages @@ -20,7 +20,15 @@ mkDerivation { ]; buildInputs = [ karchive ki18n ]; outputs = [ "out" "dev" ]; - patches = [ ./kdoctools-no-find-docbook-xml.patch ]; + patches = [ ./kdoctools-no-find-docbook-xml.patch ] + # kf.doctools.core: Error: Could not find kdoctools catalogs + ++ lib.optionals stdenv.isDarwin [ + (fetchpatch { + name = "kdoctools-relocate-datapath.patch"; + url = "https://github.com/msys2/MINGW-packages/raw/0900785a1f4e4146ab9561fb92a1c70fa70fcfc4/mingw-w64-kdoctools-qt5/0001-kdoctools-relocate-datapath.patch"; + hash = "sha256-MlokdrabXavWHGXYmdz9zZDJQIwAdNxebJBSAH2Z3vI="; + }) + ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXSL_DIR=${docbook_xsl_ns}/xml/xsl/docbook" From 8f7d2c182909a46058deaf56903aeee032684222 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 21 Apr 2023 11:25:30 +0300 Subject: [PATCH 3/4] plasma5Packages.ktexteditor: add darwin support --- .../libraries/kde-frameworks/ktexteditor.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index 5788c07cb05c..ccc9f76b237a 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -1,12 +1,12 @@ { - mkDerivation, + mkDerivation, lib, stdenv, extra-cmake-modules, perl, karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2, qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols, editorconfig-core-c }: -mkDerivation { +mkDerivation ({ pname = "ktexteditor"; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ @@ -15,4 +15,9 @@ mkDerivation { editorconfig-core-c ]; propagatedBuildInputs = [ kparts ]; -} +} // lib.optionalAttrs stdenv.isDarwin { + postPatch = '' + substituteInPlace src/part/CMakeLists.txt \ + --replace "kpart.desktop" "${kparts}/share/kservicetypes5/kpart.desktop" + ''; +}) From b9ed2ba5165ec0a18f0c338074fe22a05b7f32d3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 20 Apr 2023 17:54:19 +0300 Subject: [PATCH 4/4] plasma5Packages: relax platforms --- pkgs/development/libraries/kde-frameworks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index abb11662a433..4245aa0ed20e 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -82,7 +82,7 @@ let homepage = meta.homepage or "https://kde.org"; license = meta.license or license; maintainers = (meta.maintainers or []) ++ maintainers; - platforms = meta.platforms or lib.platforms.linux; + platforms = meta.platforms or lib.platforms.all; }; in mkDerivation (args // {