diff --git a/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch b/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch deleted file mode 100644 index 57c58ac9255f..000000000000 --- a/pkgs/by-name/lx/lxterminal/fix-gcc14-pr122.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/lxterminal.c b/src/lxterminal.c -index 015f5e4..32e3b68 100644 ---- a/src/lxterminal.c -+++ b/src/lxterminal.c -@@ -1210,6 +1210,8 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch - vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); - ret = vte_terminal_match_add_regex(VTE_TERMINAL(term->vte), dingus2, 0); - vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); -+ vte_regex_unref(dingus1); -+ vte_regex_unref(dingus2); - #else - GRegex * dingus1 = g_regex_new(DINGUS1, G_REGEX_OPTIMIZE, 0, NULL); - GRegex * dingus2 = g_regex_new(DINGUS2, G_REGEX_OPTIMIZE, 0, NULL); -@@ -1217,9 +1219,9 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch - vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); - ret = vte_terminal_match_add_gregex(VTE_TERMINAL(term->vte), dingus2, 0); - vte_terminal_match_set_cursor_type(VTE_TERMINAL(term->vte), ret, GDK_HAND2); --#endif - g_regex_unref(dingus1); - g_regex_unref(dingus2); -+#endif - - /* Create a horizontal box inside an event box as the toplevel for the tab label. */ - term->tab = gtk_event_box_new(); diff --git a/pkgs/by-name/lx/lxterminal/package.nix b/pkgs/by-name/lx/lxterminal/package.nix index 956d3e3b121a..9fb97945ae4e 100644 --- a/pkgs/by-name/lx/lxterminal/package.nix +++ b/pkgs/by-name/lx/lxterminal/package.nix @@ -18,15 +18,15 @@ pcre2, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lxterminal"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "lxde"; repo = "lxterminal"; - rev = version; - sha256 = "sha256-bCF/V6yFe4vKqVMOtNlwYyw/ickj1LFuFn4IyypwIg0="; + tag = finalAttrs.version; + sha256 = "sha256-oDWh0U4QWJ84hTfq1oaAmDJM+IY0eJqOUey0qBgZN5U="; }; configureFlags = [ @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { ]; patches = [ - ./fix-gcc14-pr122.patch # manual port of https://github.com/lxde/lxterminal/pull/122 ./respect-xml-catalog-files-var.patch ]; @@ -73,10 +72,10 @@ stdenv.mkDerivation rec { desktop-independent VTE-based terminal emulator for LXDE without any unnecessary dependencies. ''; - homepage = "https://wiki.lxde.org/en/LXTerminal"; - license = lib.licenses.gpl2; + homepage = "https://www.lxde.org/"; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.pbsds ]; platforms = lib.platforms.linux; mainProgram = "lxterminal"; }; -} +})