From 5f9a1c18f2c103039e4c24088a06ca46e73a10a3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 5 Mar 2018 13:31:50 +0800 Subject: [PATCH 1/2] okular: add support for CHM, ZIP and markdown files --- pkgs/applications/kde/okular.nix | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 64511aabf7c0..36573f9aeb9e 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -1,25 +1,27 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion, - kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, - kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2, - libspectre, phonon, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver + chmlib, discount, djvulibre, ebook_tools, kactivities, karchive, kbookmarks, + kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, + kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, + kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, qca-qt5, + qtdeclarative, qtsvg, threadweaver }: mkDerivation { name = "okular"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets - kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio - kparts kpty kwallet kwindowsystem libkexiv2 libspectre phonon poppler - qca-qt5 qtdeclarative qtsvg threadweaver + chmlib discount djvulibre ebook_tools kactivities karchive kbookmarks + kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons + kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet + kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 + qtdeclarative qtsvg threadweaver ]; - meta = { - platforms = lib.platforms.linux; + meta = with lib; { homepage = http://www.kde.org; - license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; - maintainers = [ lib.maintainers.ttuegel ]; + license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; + maintainers = with maintainers; [ ttuegel ]; + platforms = lib.platforms.linux; }; } From 18e97a3575b18dcebf36b796ede4e47ad46aa1a8 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 7 Mar 2018 09:28:18 +0800 Subject: [PATCH 2/2] okular: exclude chmlib on ARM --- pkgs/applications/kde/okular.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 36573f9aeb9e..5f6f28c95b08 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -1,7 +1,7 @@ { - mkDerivation, lib, + stdenv, mkDerivation, lib, extra-cmake-modules, kdoctools, - chmlib, discount, djvulibre, ebook_tools, kactivities, karchive, kbookmarks, + chmlib ? null, discount, djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, qca-qt5, @@ -12,12 +12,12 @@ mkDerivation { name = "okular"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - chmlib discount djvulibre ebook_tools kactivities karchive kbookmarks + discount djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 qtdeclarative qtsvg threadweaver - ]; + ] ++ lib.optional (!stdenv.isAarch64) chmlib; meta = with lib; { homepage = http://www.kde.org; license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];