Commit fa9cc1b2 authored by colin's avatar colin
Browse files

kiwix: split libkiwix out its own toplevel package 

this allows libkiwix to be more easily used by non-nixpkgs consumers.
parent bea06ddf

pkgs/applications/misc/kiwix/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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 = [

pkgs/applications/misc/kiwix/lib.nix

+9 −1
Original line number Diff line number Diff line 
{ 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 ];

  };

}

pkgs/top-level/all-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -30172,6 +30172,8 @@ with pkgs; 














  leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { };



























  libkiwix = callPackage ../applications/misc/kiwix/lib.nix { };



























  libowfat = callPackage ../development/libraries/libowfat { };





























  libowlevelzs = callPackage ../development/libraries/libowlevelzs { };