diff options
author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-04-03 14:14:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-03 14:14:57 +0200 |
commit | a1c35e4d43c38342583c393ad647da6851fdf6d7 (patch) | |
tree | 3a9d9328ea195977efb78cf1e5470e7b78e49c97 | |
parent | b0079ff567903b8db769bff952d63d0971965e33 (diff) | |
parent | fe01395de21d2e28fbaa9933cfbdc453643c76ea (diff) |
Merge pull request #298756 from azahi/mvf-qolibri
qolibri: 2.1.4 -> 2.1.5-unstable-2024-03-17
-rw-r--r-- | pkgs/applications/misc/qolibri/default.nix | 61 |
1 files changed, 47 insertions, 14 deletions
diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index c0530dfe78e30..0439e212d1122 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -1,32 +1,65 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, libeb, lzo -, qtmultimedia, qttools, qtwebengine, wrapQtAppsHook }: +{ stdenv +, lib +, fetchFromGitHub +, cmake +, ninja +, qttools +, qtwebengine +, wrapQtAppsHook +}: -stdenv.mkDerivation rec { +let + eb = fetchFromGitHub { + owner = "mvf"; + repo = "eb"; + rev = "58e1c3bb9847ed5d05863f478f21e7a8ca3d74c8"; + hash = "sha256-gZP+2P6fFADWht2c0hXmljVJQX8RpCq2mWP+KDi+GzE="; + }; +in + +stdenv.mkDerivation { pname = "qolibri"; - version = "2.1.4"; + version = "2.1.5-unstable-2024-03-17"; src = fetchFromGitHub { - owner = "ludios"; + owner = "mvf"; repo = "qolibri"; - rev = version; - sha256 = "jyLF1MKDVH0Lt8lw+O93b+LQ4J+s42O3hebthJk83hg="; + rev = "99f0771184fcb2c5f47aad11c16002ebb8469a3f"; + hash = "sha256-ArupqwejOO2YK9a3Ky0j20dIHs1jIqJksNIb4K2jwgI="; }; - nativeBuildInputs = [ pkg-config cmake qttools wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + ninja + qttools + wrapQtAppsHook + ]; + buildInputs = [ - libeb lzo qtmultimedia qtwebengine + qtwebengine + ]; + + cmakeFlags = [ + "-DQOLIBRI_EB_SOURCE_DIR=${eb}" ]; postInstall = '' - install -D $src/qolibri.desktop -t $out/share/applications + install -Dm644 $src/qolibri.desktop -t $out/share/applications + + for size in 16 32 48 64 128; do + install -Dm644 \ + $src/images/qolibri-$size.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/qolibri.png + done ''; meta = with lib; { - homepage = "https://github.com/ludios/qolibri"; description = "EPWING reader for viewing Japanese dictionaries"; - mainProgram = "qolibri"; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + homepage = "https://github.com/mvf/qolibri"; license = licenses.gpl2; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + broken = stdenv.isDarwin && stdenv.isx86_64; # Looks like a libcxx version mismatch problem. + mainProgram = "qolibri"; }; } |