diff --git a/nixos/modules/config/vte.nix b/nixos/modules/config/vte.nix index f7c639b627a0..75ac3bae4be3 100644 --- a/nixos/modules/config/vte.nix +++ b/nixos/modules/config/vte.nix @@ -9,7 +9,7 @@ let vteInitSnippet = '' # Show current working directory in VTE terminals window title. # Supports both bash and zsh, requires interactive shell. - . ${pkgs.vte.override { gtkVersion = null; }}/etc/profile.d/vte.sh + . ${pkgs.vte-gtk4}/etc/profile.d/vte.sh ''; in diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix index c873530f2037..9edb648d1690 100644 --- a/pkgs/by-name/vt/vte/package.nix +++ b/pkgs/by-name/vt/vte/package.nix @@ -23,9 +23,11 @@ pango, pcre2, cairo, + fmt_11, fribidi, lz4, icu, + simdutf, systemd, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, fast-float, @@ -36,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; - version = "0.80.3"; + version = "0.81.90"; outputs = [ "out" @@ -46,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; - hash = "sha256-Lllv0/vqu3FTFmIiTnH2osN/aEQmE21ihUYnJ2709pk="; + hash = "sha256-kLJhqwJZf+6UH3GmV+v50OMDqsN3tIXERNhUQ1oJEyE="; }; patches = [ @@ -58,6 +60,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; hash = "sha256-FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; }) + + # Fix compilation with gcc 14 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/vte/-/commit/e297ba0507d0e7863edd411dfc5264bbc490e4f6.patch"; + hash = "sha256-uTaeb7bLUBefgF5Uxl7Qxlcp5Uj7pqW8XiR/5rsjuTI="; + }) ]; nativeBuildInputs = [ @@ -76,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ cairo + fmt_11 fribidi gnutls pango # duplicated with propagatedBuildInputs to support gtkVersion == null @@ -83,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: { lz4 icu fast-float + simdutf ] ++ lib.optionals systemdSupport [ systemd