Unverified Commit 2eb13af5 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #227274 from wegank/kde-darwin 

plasma5Packages: relax platforms
parents d718c355 b9ed2ba5

pkgs/development/libraries/kde-frameworks/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 // {

pkgs/development/libraries/kde-frameworks/kauth/default.nix

+2 −2
Original line number Diff line number Diff line 
{

  lib, mkDerivation, propagate,

  lib, stdenv, mkDerivation, propagate,

  extra-cmake-modules, kcoreaddons, qttools,

  enablePolkit ? true, polkit-qt

  enablePolkit ? stdenv.isLinux, polkit-qt

}:



mkDerivation {

pkgs/development/libraries/kde-frameworks/kcoreaddons.nix

+4 −1
Original line number Diff line number Diff line 
{

  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";

})

pkgs/development/libraries/kde-frameworks/kdoctools/default.nix

+10 −2
Original line number Diff line number Diff line 
{

  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"

pkgs/development/libraries/kde-frameworks/ktexteditor.nix

+8 −3
Original line number Diff line number Diff line 
{

  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"

  '';

})