From e332ad7a33e4815fe730514598bea98d8ddd32d4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 13 Jun 2022 02:20:29 +0200 Subject: [PATCH] tagainijisho: 1.0.3 -> 1.2.0 qt4 -> qt5 --- .../office/tagainijisho/default.nix | 17 ++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 7869b54a5f04..7211d4f9e562 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,16 +1,19 @@ -{ lib, stdenv, fetchurl, qt4, cmake, sqlite }: - -stdenv.mkDerivation rec { +{ lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }: +mkDerivation rec { pname = "tagainijisho"; - version = "1.0.3"; + version = "1.2.0"; - src = fetchurl { + src = fetchzip { url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz"; - sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; + hash = "sha256-fLq4Wfpa7Wr62KvHztgLiXE8eopCq+wipgabFm2bq6w="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 sqlite ]; + buildInputs = [ qtbase qttools sqlite ]; + + cmakeFlags = [ + "-DEMBED_SQLITE=OFF" + ]; meta = with lib; { description = "A free, open-source Japanese dictionary and kanji lookup tool"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b758597249e2..0bd1a2186dbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30286,7 +30286,7 @@ with pkgs; inherit (haskell.packages.ghc8107) ghcWithPackages taffybar; }; - tagainijisho = callPackage ../applications/office/tagainijisho {}; + tagainijisho = libsForQt5.callPackage ../applications/office/tagainijisho {}; tahoe-lafs = callPackage ../tools/networking/p2p/tahoe-lafs {};