pyrox.dev / nixpkgs
lol
fork atom

kiwix: split libkiwix out its own toplevel package

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

colin fa9cc1b2 bea06ddf

+13 -3
unified split
+2 -2
pkgs/applications/misc/kiwix/default.nix
··· 1 { lib, mkDerivation, fetchFromGitHub 2 - , callPackage 3 , pkg-config 4 , qmake 5 , qtbase ··· 26 ]; 27 28 buildInputs = [ 29 qtbase 30 qtwebengine 31 qtsvg 32 qtimageformats 33 - (callPackage ./lib.nix {}) 34 ]; 35 36 qtWrapperArgs = [
··· 1 { lib, mkDerivation, fetchFromGitHub 2 + , libkiwix 3 , pkg-config 4 , qmake 5 , qtbase ··· 26 ]; 27 28 buildInputs = [ 29 + libkiwix 30 qtbase 31 qtwebengine 32 qtsvg 33 qtimageformats 34 ]; 35 36 qtWrapperArgs = [
+9 -1
pkgs/applications/misc/kiwix/lib.nix
··· 1 - { stdenv, fetchFromGitHub 2 , meson, ninja, pkg-config 3 , python3 4 , curl ··· 51 postPatch = '' 52 patchShebangs scripts 53 ''; 54 }
··· 1 + { lib, stdenv, fetchFromGitHub 2 , meson, ninja, pkg-config 3 , python3 4 , curl ··· 51 postPatch = '' 52 patchShebangs scripts 53 ''; 54 + 55 + meta = with lib; { 56 + description = "Common code base for all Kiwix ports"; 57 + homepage = "https://kiwix.org"; 58 + license = licenses.gpl3; 59 + platforms = platforms.linux; 60 + maintainers = with maintainers; [ colinsane ]; 61 + }; 62 }
+2
pkgs/top-level/all-packages.nix
··· 30172 30173 leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; 30174 30175 libowfat = callPackage ../development/libraries/libowfat { }; 30176 30177 libowlevelzs = callPackage ../development/libraries/libowlevelzs { };
··· 30172 30173 leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; 30174 30175 + libkiwix = callPackage ../applications/misc/kiwix/lib.nix { }; 30176 + 30177 libowfat = callPackage ../development/libraries/libowfat { }; 30178 30179 libowlevelzs = callPackage ../development/libraries/libowlevelzs { };