Skip to content

Commit 3539d05

Browse files
luakit: hammer
- nixfmt-rfc-style - finalAttrs - strictDeps - no nested with
1 parent d41f0ad commit 3539d05

File tree

1 file changed

+53
-46
lines changed

1 file changed

+53
-46
lines changed

pkgs/by-name/lu/luakit/package.nix

Lines changed: 53 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,58 @@
1-
{ lib
2-
, stdenv
3-
, fetchFromGitHub
4-
, pkg-config
5-
, wrapGAppsHook3
6-
, help2man
7-
, glib-networking
8-
, gst_all_1
9-
, gtk3
10-
, luajitPackages
11-
, luajit
12-
, sqlite
13-
, webkitgtk_4_0
1+
{
2+
lib,
3+
fetchFromGitHub,
4+
glib-networking,
5+
gst_all_1,
6+
gtk3,
7+
help2man,
8+
luajit,
9+
luajitPackages,
10+
pkg-config,
11+
sqlite,
12+
stdenv,
13+
webkitgtk_4_0,
14+
wrapGAppsHook3,
1415
}:
1516

1617
let
1718
inherit (luajitPackages) luafilesystem;
1819
in
19-
stdenv.mkDerivation rec {
20+
stdenv.mkDerivation (finalAttrs: {
2021
pname = "luakit";
2122
version = "2.3.3";
2223

2324
src = fetchFromGitHub {
2425
owner = "luakit";
25-
repo = pname;
26-
rev = version;
26+
repo = "luakit";
27+
rev = finalAttrs.version;
2728
hash = "sha256-DtoixcLq+ddbacTAo+Qq6q4k1i6thirACw1zqUeOxXo=";
2829
};
2930

3031
nativeBuildInputs = [
32+
luajit
3133
pkg-config
3234
help2man
3335
wrapGAppsHook3
3436
];
35-
buildInputs = [
36-
gtk3
37-
glib-networking # TLS support
38-
luafilesystem
39-
luajit
40-
sqlite
41-
webkitgtk_4_0
42-
] ++ ( with gst_all_1; [
43-
gstreamer
44-
gst-plugins-base
45-
gst-plugins-good
46-
gst-plugins-bad
47-
gst-plugins-ugly
48-
gst-libav
49-
]);
5037

38+
buildInputs =
39+
[
40+
glib-networking # TLS support
41+
gtk3
42+
luafilesystem
43+
sqlite
44+
webkitgtk_4_0
45+
]
46+
++ (with gst_all_1; [
47+
gst-libav
48+
gst-plugins-bad
49+
gst-plugins-base
50+
gst-plugins-good
51+
gst-plugins-ugly
52+
gstreamer
53+
]);
54+
55+
strictDeps = true;
5156

5257
# build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found
5358
# TODO: why is not this the default? The test runner adds
@@ -66,29 +71,31 @@ stdenv.mkDerivation rec {
6671
"XDGPREFIX=${placeholder "out"}/etc/xdg"
6772
];
6873

69-
preFixup = let
70-
luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua";
71-
in ''
72-
gappsWrapperArgs+=(
73-
--prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
74-
--prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH"
75-
--prefix LUA_CPATH ';' "$LUA_CPATH"
76-
)
77-
'';
74+
preFixup =
75+
let
76+
luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua";
77+
in
78+
''
79+
gappsWrapperArgs+=(
80+
--prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
81+
--prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH"
82+
--prefix LUA_CPATH ';' "$LUA_CPATH"
83+
)
84+
'';
7885

79-
meta = with lib; {
86+
meta = {
8087
homepage = "https://luakit.github.io/";
8188
description = "Fast, small, webkit-based browser framework extensible in Lua";
82-
mainProgram = "luakit";
8389
longDescription = ''
8490
Luakit is a highly configurable browser framework based on the WebKit web
8591
content engine and the GTK+ toolkit. It is very fast, extensible with Lua,
8692
and licensed under the GNU GPLv3 license. It is primarily targeted at
8793
power users, developers and anyone who wants to have fine-grained control
8894
over their web browser’s behaviour and interface.
8995
'';
90-
license = licenses.gpl3Only;
91-
maintainers = [ maintainers.AndersonTorres ];
92-
platforms = platforms.unix;
96+
license = lib.licenses.gpl3Only;
97+
mainProgram = "luakit";
98+
maintainers = with lib.maintainers; [ AndersonTorres ];
99+
platforms = lib.platforms.unix;
93100
};
94-
}
101+
})

0 commit comments

Comments
 (0)