koreader-from-src: remove some unneeded buildInputs

This commit is contained in:
2023-07-22 09:32:15 +00:00
parent 307e93de3b
commit 0479a43f2d

View File

@@ -11,34 +11,20 @@
, fetchgit , fetchgit
, fetchurl , fetchurl
, dpkg , dpkg
, glib , gettext
, gnutar
, gtk3-x11
, luajit , luajit
# , lua51Packages
, perl , perl
, pkg-config , pkg-config
, python3 , python3
, ragel , ragel
, sdcv
, SDL2 , SDL2
, substituteAll , substituteAll
, which , which
}: }:
let let
sources = import ./sources.nix; sources = import ./sources.nix;
# luajson = luajit_lua52.pkgs.buildLuarocksPackage {
# pname = "luajson";
# version = "1.3.4-1";
# source = fetchgit {
# url = "https://github.com/harningt/luajson.git";
# rev = "1.3.4";
# hash = "sha256-JaJsjN5Gp+8qswfzl5XbHRQMfaCAJpWDWj9DYWJ0gEI=";
# };
# };
luajit52 = luajit.override { enable52Compat = true; self = luajit52; }; luajit52 = luajit.override { enable52Compat = true; self = luajit52; };
luaEnv = luajit52.withPackages (ps: with ps; [ luaEnv = luajit52.withPackages (ps: with ps; [
luarocks # TODO: needed?
(buildLuarocksPackage { (buildLuarocksPackage {
pname = "luajson"; pname = "luajson";
version = "1.3.4-1"; version = "1.3.4-1";
@@ -107,7 +93,6 @@ stdenv.mkDerivation rec {
dpkg dpkg
git git
libtool libtool
# lua51Packages.luarocks
makeWrapper makeWrapper
perl # TODO: openssl might try to take a runtime dep on this; see nixpkg perl # TODO: openssl might try to take a runtime dep on this; see nixpkg
pkg-config pkg-config
@@ -118,14 +103,9 @@ stdenv.mkDerivation rec {
luaEnv.pkgs.luarocks luaEnv.pkgs.luarocks
]; ];
buildInputs = [ buildInputs = [
glib #< TODO: needed? gettext
gnutar
gtk3-x11 #< TODO: needed?
# luajit_lua52
# luajson # luajson
luaEnv luaEnv
sdcv # TODO: remove this? KOreader builds (and ships) it itself
SDL2 # TODO: remove this? KOreader builds (but doesn't ship) it itself
]; ];
postPatch = postPatch =