Merge pull request #114717 from AndersonTorres/new-luakit

luakit: 2.2.1 -> 2.3
This commit is contained in:
Sandro 2021-03-04 01:05:06 +01:00 committed by GitHub
commit ac1c20756c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,34 +1,56 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, wrapGAppsHook { lib
, help2man, luafilesystem, luajit, sqlite , stdenv
, webkitgtk, gtk3, gst_all_1, glib-networking , fetchFromGitHub
, pkg-config
, wrapGAppsHook
, help2man
, glib-networking
, gst_all_1
, gtk3
, luafilesystem
, luajit
, sqlite
, webkitgtk
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "luakit"; pname = "luakit";
version = "2.2.1"; version = "2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "luakit"; owner = "luakit";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-78B8vXkWsFMJIHA72Qrk2SWubrY6YuArqcM0UAPjpzc="; hash = "sha256-5YeJkbWk1wHxWXqWOvhEDeScWPU/aRVhuOWRHLSHVZM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config help2man wrapGAppsHook pkg-config
help2man
wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
webkitgtk luafilesystem luajit sqlite gtk3 gtk3
glib-networking # TLS support glib-networking # TLS support
] ++ ( with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good luafilesystem
gst-plugins-bad gst-plugins-ugly gst-libav ]); luajit
sqlite
webkitgtk
] ++ ( with gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
gst-plugins-bad
gst-plugins-ugly
gst-libav
]);
preBuild = ''
# build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found
# TODO: why is not this the default? The test runner adds # TODO: why is not this the default? The test runner adds
# ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils # ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils
# scripts don't add an equivalent # scripts don't add an equivalent
preBuild = ''
export LUA_PATH="$LUA_PATH;./?.lua;./?/init.lua" export LUA_PATH="$LUA_PATH;./?.lua;./?/init.lua"
''; '';
@ -52,6 +74,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
homepage = "https://luakit.github.io/";
description = "Fast, small, webkit-based browser framework extensible in Lua"; description = "Fast, small, webkit-based browser framework extensible in Lua";
longDescription = '' longDescription = ''
Luakit is a highly configurable browser framework based on the WebKit web Luakit is a highly configurable browser framework based on the WebKit web
@ -60,9 +83,8 @@ stdenv.mkDerivation rec {
power users, developers and anyone who wants to have fine-grained control power users, developers and anyone who wants to have fine-grained control
over their web browsers behaviour and interface. over their web browsers behaviour and interface.
''; '';
homepage = "https://luakit.github.io/";
license = licenses.gpl3Only; license = licenses.gpl3Only;
platforms = platforms.unix;
maintainers = [ maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.unix;
}; };
} }