domterm: unstable-2022-07-22 -> unstable-2022-11-02

The part to compile with Wry is also removed for the time being.
This commit is contained in:
Gabriel Arazas 2022-11-02 18:50:44 +08:00
parent f27a50cdcc
commit d064cb9eef

View File

@ -10,32 +10,30 @@
, asciidoctor , asciidoctor
, unixtools , unixtools
, zlib , zlib
, # For including Java classes. Take note it doesn't compile them properly and it , rustPlatform
# still builds successfully so including them is disabled by default. , qt5
openjdk
, # For Qt backend which is included by default.
qt5
, enableQt ? true
, enableJava ? false
}: }:
# TODO: Compile with the experimental wry backend.
# * Wait until gdk-pixbuf is >=3.0.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "domterm"; pname = "domterm";
version = "unstable-2022-07-22"; version = "unstable-2022-11-02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PerBothner"; owner = "PerBothner";
repo = "DomTerm"; repo = "DomTerm";
rev = "ae3e4a0037f3ead62a8db0f93e25ec529e3b4756"; rev = "71f726c387c708fd4c3a4363771afdcd1993b9eb";
sha256 = "sha256-0RrmKm3YqypWBpsE2rfKAGcTJdItvS+K5HTZeq77Pks="; sha256 = "sha256-De3AnruWFK73TgGFWzOC0GaHjIW52pEqPwhRj9/RQx4=";
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ] nativeBuildInputs = with qt5; [
++ lib.optional enableQt qt5.wrapQtAppsHook; autoreconfHook pkg-config
wrapQtAppsHook
qtbase
qtwebchannel
qtwebengine
];
buildInputs = [ buildInputs = with qt5; [
asciidoctor asciidoctor
desktop-file-utils desktop-file-utils
json_c json_c
@ -43,21 +41,15 @@ stdenv.mkDerivation rec {
openssl openssl
unixtools.xxd unixtools.xxd
zlib zlib
] ++ lib.optionals enableQt (with qt5; [ qtbase qtwebengine qtwebchannel ]) ];
++ lib.optional enableJava openjdk;
configureFlags = [ configureFlags = [
"--disable-java-pty"
"--with-libwebsockets" "--with-libwebsockets"
"--with-asciidoctor"
# Until the dependencies are updated (e.g., `gdk-pixbuf >= 3.0`), this is "--enable-compiled-in-resources"
# going to be painful to build. "--enable-debug"
"--without-wry" "--with-qt"
] ++ lib.optional enableJava "--with-java" ];
++ lib.optional enableQt "--with-qt";
# Force Java to take input as UTF-8 instead of ASCII.
JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8";
meta = with lib; { meta = with lib; {
homepage = "https://domterm.org/"; homepage = "https://domterm.org/";