Merge pull request #200042 from fgaz/dillong/init

This commit is contained in:
Sandro 2022-11-08 02:11:48 +01:00 committed by GitHub
commit 7678370a07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 0 deletions

View File

@ -0,0 +1,57 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
, which
, fltk
, mbedtls
}:
stdenv.mkDerivation {
pname = "dillong";
version = "unstable-2021-12-13";
src = fetchFromGitHub {
owner = "w00fpack";
repo = "dilloNG";
rev = "2804e6e9074b840de3084abb80473983f8e49f5b";
hash = "sha256-JSBd8Lgw3I20Es/jQHBtybnLd0iAcs16TqOrOxGPGiU=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
which
];
buildInputs = [
fltk
mbedtls
];
# The start_page and home settings refer to /usr.
# We can't change /usr to $out because dillorc is copied to the home directory
# on first launch, so the paths would quickly become outdated.
# So we just comment them out, and let dillong use the defaults.
postPatch = ''
substituteInPlace dillorc \
--replace "start_page=" "#start_page=" \
--replace "home=" "#home="
'';
configureFlags = [ "--enable-ssl=yes" ];
# Workaround build failure on -fno-common toolchains:
# ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set';
# dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
meta = with lib; {
description = "Fork of Dillo, a lightweight web browser";
homepage = "https://github.com/w00fpack/dilloNG";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ fgaz ];
};
}

View File

@ -18551,6 +18551,8 @@ with pkgs;
fltk = fltk13;
};
dillong = callPackage ../applications/networking/browsers/dillong { };
directfb = callPackage ../development/libraries/directfb { };
discordchatexporter-cli = callPackage ../tools/backup/discordchatexporter-cli { };