diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-03-04 01:05:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-04 01:05:06 +0100 |
commit | ac1c20756c7ec3c35a51ce3277ad545e391d9af4 (patch) | |
tree | 0ee3bfa2cf5c71003825fd035c3dfc0341611206 | |
parent | d496205cf22c3079461d868ea3198d42ded59287 (diff) | |
parent | 70ef3914bc728c6f72c8e1101b2c35bca0c93d8e (diff) | |
download | nixpkgs-ac1c20756c7ec3c35a51ce3277ad545e391d9af4.tar nixpkgs-ac1c20756c7ec3c35a51ce3277ad545e391d9af4.tar.gz nixpkgs-ac1c20756c7ec3c35a51ce3277ad545e391d9af4.tar.bz2 nixpkgs-ac1c20756c7ec3c35a51ce3277ad545e391d9af4.tar.lz nixpkgs-ac1c20756c7ec3c35a51ce3277ad545e391d9af4.tar.xz nixpkgs-ac1c20756c7ec3c35a51ce3277ad545e391d9af4.tar.zst nixpkgs-ac1c20756c7ec3c35a51ce3277ad545e391d9af4.zip |
Merge pull request #114717 from AndersonTorres/new-luakit
luakit: 2.2.1 -> 2.3
-rw-r--r-- | pkgs/applications/networking/browsers/luakit/default.nix | 54 |
1 files changed, 38 insertions, 16 deletions
diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 917da034c30..8656b4aaa27 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -1,34 +1,56 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, wrapGAppsHook -, help2man, luafilesystem, luajit, sqlite -, webkitgtk, gtk3, gst_all_1, glib-networking +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, wrapGAppsHook +, help2man +, glib-networking +, gst_all_1 +, gtk3 +, luafilesystem +, luajit +, sqlite +, webkitgtk }: stdenv.mkDerivation rec { pname = "luakit"; - version = "2.2.1"; + version = "2.3"; src = fetchFromGitHub { owner = "luakit"; repo = pname; rev = version; - sha256 = "sha256-78B8vXkWsFMJIHA72Qrk2SWubrY6YuArqcM0UAPjpzc="; + hash = "sha256-5YeJkbWk1wHxWXqWOvhEDeScWPU/aRVhuOWRHLSHVZM="; }; nativeBuildInputs = [ - pkg-config help2man wrapGAppsHook + pkg-config + help2man + wrapGAppsHook ]; - buildInputs = [ - webkitgtk luafilesystem luajit sqlite gtk3 + gtk3 glib-networking # TLS support - ] ++ ( with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly gst-libav ]); + luafilesystem + luajit + sqlite + webkitgtk + ] ++ ( with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-libav + ]); + + # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found + # TODO: why is not this the default? The test runner adds + # ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils + # scripts don't add an equivalent preBuild = '' - # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found - # TODO: why is not this the default? The test runner adds - # ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils - # scripts don't add an equivalent export LUA_PATH="$LUA_PATH;./?.lua;./?/init.lua" ''; @@ -52,6 +74,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://luakit.github.io/"; description = "Fast, small, webkit-based browser framework extensible in Lua"; longDescription = '' 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 over their web browser’s behaviour and interface. ''; - homepage = "https://luakit.github.io/"; license = licenses.gpl3Only; - platforms = platforms.unix; maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; }; } |