pyrox.dev
dillong: refactor
- fix version string
- strictDeps
- split outputs
- no nested with
authored by Anderson Torres and committed by Francesco Gazzetta bc5cd8db d28c673f
+29
-21
pkgs/by-name/di/dillong/package.nix
+29
-21
pkgs/by-name/di/dillong/package.nix
···
1
-
{ lib
2
-
, stdenv
3
-
, fetchFromGitHub
4
-
, autoreconfHook
5
-
, pkg-config
6
-
, which
7
-
, fltk
8
-
, mbedtls_2
1
+
{
2
+
lib,
3
+
autoreconfHook,
4
+
fetchFromGitHub,
5
+
fltk,
6
+
mbedtls_2,
7
+
pkg-config,
8
+
stdenv,
9
+
which,
9
10
}:
10
11
11
12
stdenv.mkDerivation {
12
13
pname = "dillong";
13
-
version = "unstable-2021-12-13";
14
+
version = "0-unstable-2021-12-13";
14
15
15
16
src = fetchFromGitHub {
16
17
owner = "w00fpack";
···
21
22
22
23
nativeBuildInputs = [
23
24
autoreconfHook
25
+
fltk
24
26
pkg-config
25
27
which
26
28
];
···
30
32
mbedtls_2
31
33
];
32
34
35
+
outputs = [ "out" "doc" "man" ];
36
+
37
+
configureFlags = [
38
+
(lib.enableFeature true "ssl")
39
+
];
40
+
41
+
strictDeps = true;
42
+
43
+
# Workaround build failure on -fno-common toolchains:
44
+
# ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set';
45
+
# dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here
46
+
env.NIX_CFLAGS_COMPILE = "-fcommon";
47
+
33
48
# The start_page and home settings refer to /usr.
34
49
# We can't change /usr to $out because dillorc is copied to the home directory
35
50
# on first launch, so the paths would quickly become outdated.
···
40
55
--replace "home=" "#home="
41
56
'';
42
57
43
-
configureFlags = [ "--enable-ssl=yes" ];
44
-
45
-
# Workaround build failure on -fno-common toolchains:
46
-
# ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set';
47
-
# dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here
48
-
env.NIX_CFLAGS_COMPILE = "-fcommon";
49
-
50
-
meta = with lib; {
58
+
meta = {
59
+
homepage = "https://github.com/w00fpack/dilloNG";
51
60
description = "Fork of Dillo, a lightweight web browser";
52
-
homepage = "https://github.com/w00fpack/dilloNG";
53
-
license = licenses.gpl3Plus;
54
-
platforms = platforms.linux;
55
-
maintainers = with maintainers; [ fgaz ];
61
+
license = lib.licenses.gpl3Plus;
56
62
mainProgram = "dillo";
63
+
maintainers = with lib.maintainers; [ fgaz ];
64
+
platforms = lib.platforms.linux;
57
65
};
58
66
}