diff options
| author | colin <colin@uninsane.org> | 2022-12-16 00:05:53 +0000 |
|---|---|---|
| committer | colin <colin@uninsane.org> | 2023-01-13 05:07:14 +0000 |
| commit | fa9cc1b2a0f60805ced5e66367f4210cb43b1806 (patch) | |
| tree | 31235f4749a0fe91b9af5f1f239ed8f59ebe4278 /pkgs/applications/misc/kiwix | |
| parent | bea06ddf3546721446744b732265c4683b8533b9 (diff) | |
kiwix: split libkiwix out its own toplevel package
this allows libkiwix to be more easily used by non-nixpkgs consumers.
Diffstat (limited to 'pkgs/applications/misc/kiwix')
| -rw-r--r-- | pkgs/applications/misc/kiwix/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/kiwix/lib.nix | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 3263f0f992d1a..49c0155bf9852 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub -, callPackage +, libkiwix , pkg-config , qmake , qtbase @@ -26,11 +26,11 @@ mkDerivation rec { ]; buildInputs = [ + libkiwix qtbase qtwebengine qtsvg qtimageformats - (callPackage ./lib.nix {}) ]; qtWrapperArgs = [ diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/applications/misc/kiwix/lib.nix index 4e3ff063aa57e..ffbcd1bb3016b 100644 --- a/pkgs/applications/misc/kiwix/lib.nix +++ b/pkgs/applications/misc/kiwix/lib.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config , python3 , curl @@ -51,4 +51,12 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs scripts ''; + + meta = with lib; { + description = "Common code base for all Kiwix ports"; + homepage = "https://kiwix.org"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ colinsane ]; + }; } |