Merge pull request #326789 from K900/kf-6.4

{ cmake

, fetchFromGitLab

, kdePackages

, lib

, pkg-config

, stdenv

}:

stdenv.mkDerivation rec {

  pname = "francis";

  version = "24.05.0";

  src = fetchFromGitLab {

    domain = "invent.kde.org";

    repo = "francis";

    owner = "utilities";

    rev = "v${version}";

    hash = "sha256-mvB01iFvTmGSGaCdvyMOC8BaIgZgyeyRJEra31w04DI=";

  };

  nativeBuildInputs = [

    cmake

    kdePackages.kirigami

    kdePackages.kirigami-addons

    kdePackages.plasma5support

    kdePackages.qqc2-desktop-style

    kdePackages.qtsvg

    kdePackages.qtwayland

    kdePackages.wrapQtAppsHook

    pkg-config

  ];

  buildInputs = [

    kdePackages.kiconthemes

    # otherwise buttons are blank on non-kde

    kdePackages.breeze-icons

  ];

  cmakeFlags = [

    # fix can't find Qt6QmlCompilerPlusPrivate

    "-DQT_NO_FIND_QMLSC=TRUE"

  ];

  meta = with lib; {

    description = "Using the well-known pomodoro technique to help you get more productive";

    homepage = "https://apps.kde.org/francis/";

    license = with licenses; [ bsd2 bsd3 cc0 lgpl2Plus lgpl21Plus gpl3Plus ];

    mainProgram = "francis";

    maintainers = with maintainers; [ cimm ];

    platforms = lib.platforms.linux;

  };

}

{

  mkKdeDerivation,

  qtdeclarative,

  libical,

}:

mkKdeDerivation {

  pname = "kcalendarcore";

  extraBuildInputs = [libical];

  extraBuildInputs = [qtdeclarative libical];

}

  patches = [

    # Remove hardcoded smbd search path

    ./0001-Remove-impure-smbd-search-path.patch

    # When running a process through systemd, resolve the full path ourselves

    ./early-resolve-executables.diff

    # FIXME(later): discuss with upstream?

  ];

  extraBuildInputs = [qt5compat qttools acl attr];

diff --git a/src/gui/systemd/systemdprocessrunner.cpp b/src/gui/systemd/systemdprocessrunner.cpp

index afe3e2c69..5e5ee012d 100644

--- a/src/gui/systemd/systemdprocessrunner.cpp

+++ b/src/gui/systemd/systemdprocessrunner.cpp

@@ -128,7 +128,7 @@ void SystemdProcessRunner::startProcess()

                                               // so we can be notified (see https://github.com/systemd/systemd/pull/3984)

             {QStringLiteral("Environment"), m_process->environment()},

             {QStringLiteral("WorkingDirectory"), m_process->workingDirectory()},

-            {QStringLiteral("ExecStart"), QVariant::fromValue(ExecCommandList{{m_process->program().first(), m_process->program(), false}})},

+            {QStringLiteral("ExecStart"), QVariant::fromValue(ExecCommandList{{QStandardPaths::findExecutable(m_process->program().first()), m_process->program(), false}})},

         },

         {} // aux is currently unused and should be passed as empty array.

     );

  mkKdeDerivation,

  qtdeclarative,

  qtsvg,

  fetchpatch,

}:

mkKdeDerivation {

  pname = "ksvg";

  patches = [

    # Backport patch for SVG rendering glitches with fractional scale

    # FIXME: remove in 6.4

    (fetchpatch {

      url = "https://invent.kde.org/frameworks/ksvg/-/commit/74f9f9cbd226407f8cde08c5cd5a711444e2775d.patch";

      hash = "sha256-i4Wcvo0CkpN2qdlTesnzUyd0mzG1VKbycP5Pd1rHPVg=";

    })

  ];

  extraBuildInputs = [qtdeclarative qtsvg];

}