From b2f369ade265325dfee27de85668c8960068203c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Jul 2022 08:10:45 +0200 Subject: [PATCH] vte-gtk4: init --- pkgs/development/libraries/vte/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 739328117a70..a2eec8092abe 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -9,6 +9,8 @@ , gnome , glib , gtk3 +, gtk4 +, gtkVersion ? "3" , gobject-introspection , vala , python3 @@ -69,15 +71,18 @@ stdenv.mkDerivation rec { systemd ]; - propagatedBuildInputs = [ + propagatedBuildInputs = assert (gtkVersion == "3" || gtkVersion == "4"); [ # Required by vte-2.91.pc. - gtk3 + (if gtkVersion == "3" then gtk3 else gtk4) glib pango ]; mesonFlags = lib.optionals (!systemdSupport) [ "-D_systemd=false" + ] ++ lib.optionals (gtkVersion == "4") [ + "-Dgtk3=false" + "-Dgtk4=true" ] ++ lib.optionals stdenv.isDarwin [ # -Bsymbolic-functions is not supported on darwin "-D_b_symbolic_functions=false" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 664f95b56f2f..b38c9c6ec07e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22430,6 +22430,10 @@ with pkgs; stdenv = clangStdenv; }; + vte-gtk4 = vte.override { + gtkVersion = "4"; + }; + vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix {