diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix deleted file mode 100644 index 9821cdd2f2f8..000000000000 --- a/pkgs/applications/office/kitsas/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, qmake, qtsvg, poppler, libzip, pkg-config, wrapQtAppsHook }: - -stdenv.mkDerivation rec { - pname = "kitsas"; - version = "4.0.5"; - - src = fetchFromGitHub { - owner = "artoh"; - repo = "kitupiikki"; - rev = "v${version}"; - hash = "sha256-ODl1yrtrCVhuBWbA1AvHl22d+JSdySG/Gi2hlpVW3jg="; - }; - - postPatch = '' - substituteInPlace kitsas/kitsas.pro \ - --replace "LIBS += -L/usr/local/opt/poppler-qt5/lib -lpoppler-qt6" "LIBS += -lpoppler-qt5" - ''; - - nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; - - buildInputs = [ qtsvg poppler libzip ]; - - # We use a separate build-dir as otherwise ld seems to get confused between - # directory and executable name on buildPhase. - preConfigure = '' - mkdir build && cd build - ''; - - qmakeFlags = [ "../kitsas/kitsas.pro" ]; - - installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - mv kitsas.app $out/Applications - '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - install -Dm755 kitsas -t $out/bin - install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps - install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps - install -Dm644 ../kitsas.desktop -t $out/share/applications - ''; - - meta = with lib; { - homepage = "https://github.com/artoh/kitupiikki"; - description = "Accounting tool suitable for Finnish associations and small business"; - mainProgram = "kitsas"; - maintainers = with maintainers; [ gspia ]; - license = licenses.gpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix new file mode 100644 index 000000000000..854c53cc5327 --- /dev/null +++ b/pkgs/by-name/ki/kitsas/package.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenv, + fetchFromGitHub, + qt6, + poppler, + libzip, + pkg-config, +}: + +stdenv.mkDerivation rec { + pname = "kitsas"; + version = "5.7"; + + src = fetchFromGitHub { + owner = "artoh"; + repo = "kitupiikki"; + rev = "v${version}"; + hash = "sha256-1TZFw1Q9+FsGHwitErDhwyA941rtb+h9OgJLFLyhV7k="; + }; + + nativeBuildInputs = [ + pkg-config + qt6.qmake + qt6.wrapQtAppsHook + ]; + + buildInputs = + [ + libzip + poppler + qt6.qt5compat + qt6.qtsvg + qt6.qtwebengine + ] + ++ lib.optional stdenv.hostPlatform.isLinux [ + qt6.qtwayland + ]; + + # We use a separate build-dir as otherwise ld seems to get confused between + # directory and executable name on buildPhase. + preConfigure = '' + mkdir build && cd build + ''; + + qmakeFlags = [ "../kitsas/kitsas.pro" ]; + + installPhase = + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv kitsas.app $out/Applications + '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + install -Dm755 kitsas -t $out/bin + install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps + install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps + install -Dm644 ../kitsas.desktop -t $out/share/applications + ''; + + meta = with lib; { + homepage = "https://github.com/artoh/kitupiikki"; + description = "Accounting tool suitable for Finnish associations and small business"; + mainProgram = "kitsas"; + maintainers = with maintainers; [ gspia ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa3c31089af6..fa706277aefd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30225,8 +30225,6 @@ with pkgs; kile = callPackage ../applications/editors/kile { }; - kitsas = libsForQt5.callPackage ../applications/office/kitsas { }; - kiwix = libsForQt5.callPackage ../applications/misc/kiwix { }; kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { };