Unverified Commit 3dd73c40 authored by Atemu's avatar Atemu Committed by GitHub
Browse files

kitsas: 4.0.5 -> 5.7 (#347308)

parents d7a8b077 8ad33345

pkgs/applications/office/kitsas/default.nix→pkgs/by-name/ki/kitsas/package.nix

+68 −0
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, qmake, qtsvg, poppler, libzip, pkg-config, wrapQtAppsHook }:

{

  lib,

  stdenv,

  fetchFromGitHub,

  qt6,

  poppler,

  libzip,

  pkg-config,

}:



stdenv.mkDerivation rec {

  pname = "kitsas";

  version = "4.0.5";

  version = "5.7";



  src = fetchFromGitHub {

    owner = "artoh";

    repo = "kitupiikki";

    rev = "v${version}";

    hash = "sha256-ODl1yrtrCVhuBWbA1AvHl22d+JSdySG/Gi2hlpVW3jg=";

    hash = "sha256-1TZFw1Q9+FsGHwitErDhwyA941rtb+h9OgJLFLyhV7k=";

  };



  postPatch = ''

    substituteInPlace kitsas/kitsas.pro \

      --replace "LIBS += -L/usr/local/opt/poppler-qt5/lib -lpoppler-qt6" "LIBS += -lpoppler-qt5"

  '';



  nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];

  nativeBuildInputs = [

    pkg-config

    qt6.qmake

    qt6.wrapQtAppsHook

  ];



  buildInputs = [ qtsvg poppler libzip ];

  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.
@@ -28,10 +45,12 @@ stdenv.mkDerivation rec { 


  qmakeFlags = [ "../kitsas/kitsas.pro" ];



  installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''

  installPhase =

    lib.optionalString stdenv.hostPlatform.isDarwin ''

      mkdir -p $out/Applications

      mv kitsas.app $out/Applications

  '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''

    ''

    + 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

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -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 { };