From 0a4072ce23489f4ab63621d53356ddfc736b764e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 16 Feb 2022 16:35:41 +0000 Subject: [PATCH] =?UTF-8?q?vte:=200.64.2=20=E2=86=92=200.67.90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.64.2...0.66.0 https://gitlab.gnome.org/GNOME/vte/-/compare/0.66.0...0.67.90 Need to switch to clangStdenv since aarch6 is stuck on GCC 9 but vte requires at least GCC 10. I also tried gcc11Stdenv but that failed with linking issues. --- pkgs/development/libraries/vte/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index aae30390ee41..9e9442082901 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.64.2"; + version = "0.67.90"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KzyCC2WmZ8HYhZuiBHi+Ym0VGcwxWdrCX3AzMMbQfhg="; + sha256 = "sha256-RkCe1x/DqkfX3DkCSaU+i4E6xsCYvawVFuEL23wg2zg="; }; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78fbd57c3839..729654a23f7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20614,7 +20614,10 @@ with pkgs; vsqlite = callPackage ../development/libraries/vsqlite { }; - vte = callPackage ../development/libraries/vte { }; + vte = callPackage ../development/libraries/vte { + # Needs GCC ≥10 but aarch64 defaults to GCC 9. + stdenv = clangStdenv; + }; vte_290 = callPackage ../development/libraries/vte/2.90.nix { };