Commit 69ee28dc authored by K900's avatar K900
Browse files

kdePackages.francis: fix build, deduplicate

parent 45cd7d5a
Loading
Loading
Loading
Loading
+0 −52
Original line number Diff line number Diff line
{ 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;
  };
}
+10 −0
Original line number Diff line number Diff line
{
  mkKdeDerivation,
  fetchpatch,
  qtsvg,
}:
mkKdeDerivation {
  pname = "francis";

  patches = [
    # Fix linking issue
    # FIXME: remove in next update
    (fetchpatch {
      url = "https://invent.kde.org/utilities/francis/-/commit/4d5407a42e4871d66f4de4522fbbf83c35604550.patch";
      hash = "sha256-p9DVc92e8QBDHwZybVLNzSH8dr0XmRzrnIT45YD9t/Q=";
    })
  ];

  extraBuildInputs = [qtsvg];
}
+1 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ mapAliases ({
  foxitreader = throw "foxitreader has been removed because it had vulnerabilities and was unmaintained"; # added 2023-02-20
  fractal-next = fractal; # added 2023-11-25
  framework-system-tools = framework-tool; # added 2023-12-09
  francis = kdePackages.francis; # added 2024-07-13
  fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05
  frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17
  fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.