lol

Merge pull request #227274 from wegank/kde-darwin

plasma5Packages: relax platforms

authored by

Weijia Wang and committed by
GitHub
2eb13af5 d718c355

+25 -9
+1 -1
pkgs/development/libraries/kde-frameworks/default.nix
··· 82 82 homepage = meta.homepage or "https://kde.org"; 83 83 license = meta.license or license; 84 84 maintainers = (meta.maintainers or []) ++ maintainers; 85 - platforms = meta.platforms or lib.platforms.linux; 85 + platforms = meta.platforms or lib.platforms.all; 86 86 }; 87 87 88 88 in mkDerivation (args // {
+2 -2
pkgs/development/libraries/kde-frameworks/kauth/default.nix
··· 1 1 { 2 - lib, mkDerivation, propagate, 2 + lib, stdenv, mkDerivation, propagate, 3 3 extra-cmake-modules, kcoreaddons, qttools, 4 - enablePolkit ? true, polkit-qt 4 + enablePolkit ? stdenv.isLinux, polkit-qt 5 5 }: 6 6 7 7 mkDerivation {
+4 -1
pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
··· 1 1 { 2 - mkDerivation, lib, 2 + mkDerivation, lib, stdenv, 3 3 extra-cmake-modules, 4 4 qtbase, qttools, shared-mime-info 5 5 }: ··· 18 18 postInstall = '' 19 19 moveToOutput "mkspecs" "$dev" 20 20 ''; 21 + } // lib.optionalAttrs stdenv.isDarwin { 22 + # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/327 23 + env.NIX_CFLAGS_COMPILE = "-DSOCK_CLOEXEC=0"; 21 24 })
+10 -2
pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
··· 1 1 { 2 - mkDerivation, 2 + mkDerivation, lib, stdenv, fetchpatch, 3 3 extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns, 4 4 karchive, ki18n, qtbase, 5 5 perl, perlPackages ··· 20 20 ]; 21 21 buildInputs = [ karchive ki18n ]; 22 22 outputs = [ "out" "dev" ]; 23 - patches = [ ./kdoctools-no-find-docbook-xml.patch ]; 23 + patches = [ ./kdoctools-no-find-docbook-xml.patch ] 24 + # kf.doctools.core: Error: Could not find kdoctools catalogs 25 + ++ lib.optionals stdenv.isDarwin [ 26 + (fetchpatch { 27 + name = "kdoctools-relocate-datapath.patch"; 28 + url = "https://github.com/msys2/MINGW-packages/raw/0900785a1f4e4146ab9561fb92a1c70fa70fcfc4/mingw-w64-kdoctools-qt5/0001-kdoctools-relocate-datapath.patch"; 29 + hash = "sha256-MlokdrabXavWHGXYmdz9zZDJQIwAdNxebJBSAH2Z3vI="; 30 + }) 31 + ]; 24 32 cmakeFlags = [ 25 33 "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" 26 34 "-DDocBookXSL_DIR=${docbook_xsl_ns}/xml/xsl/docbook"
+8 -3
pkgs/development/libraries/kde-frameworks/ktexteditor.nix
··· 1 1 { 2 - mkDerivation, 2 + mkDerivation, lib, stdenv, 3 3 extra-cmake-modules, perl, 4 4 karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2, 5 5 qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols, 6 6 editorconfig-core-c 7 7 }: 8 8 9 - mkDerivation { 9 + mkDerivation ({ 10 10 pname = "ktexteditor"; 11 11 nativeBuildInputs = [ extra-cmake-modules perl ]; 12 12 buildInputs = [ ··· 15 15 editorconfig-core-c 16 16 ]; 17 17 propagatedBuildInputs = [ kparts ]; 18 - } 18 + } // lib.optionalAttrs stdenv.isDarwin { 19 + postPatch = '' 20 + substituteInPlace src/part/CMakeLists.txt \ 21 + --replace "kpart.desktop" "${kparts}/share/kservicetypes5/kpart.desktop" 22 + ''; 23 + })