From f6260b00baa812e13e8235cf47459d7d52ed3431 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 7 Nov 2022 17:13:20 +0100 Subject: [PATCH] dillong: init at unstable-2021-12-13 --- .../networking/browsers/dillong/default.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/applications/networking/browsers/dillong/default.nix diff --git a/pkgs/applications/networking/browsers/dillong/default.nix b/pkgs/applications/networking/browsers/dillong/default.nix new file mode 100644 index 000000000000..2d12134caadd --- /dev/null +++ b/pkgs/applications/networking/browsers/dillong/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c97f1d41dbda..75db3ae912a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18496,6 +18496,8 @@ with pkgs; fltk = fltk13; }; + dillong = callPackage ../applications/networking/browsers/dillong { }; + directfb = callPackage ../development/libraries/directfb { }; discordchatexporter-cli = callPackage ../tools/backup/discordchatexporter-cli { };