diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-07-24 08:10:45 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-11 18:52:12 +0200 |
| commit | b2f369ade265325dfee27de85668c8960068203c (patch) | |
| tree | 8d20a86b4caa47c5f6c53a47508ce9268b0cc9f5 | |
| parent | 45b0d213394f24755c8ec9d6d0428f3c2974a308 (diff) | |
| download | nixpkgs-b2f369ade265325dfee27de85668c8960068203c.tar nixpkgs-b2f369ade265325dfee27de85668c8960068203c.tar.gz nixpkgs-b2f369ade265325dfee27de85668c8960068203c.tar.bz2 nixpkgs-b2f369ade265325dfee27de85668c8960068203c.tar.lz nixpkgs-b2f369ade265325dfee27de85668c8960068203c.tar.xz nixpkgs-b2f369ade265325dfee27de85668c8960068203c.tar.zst nixpkgs-b2f369ade265325dfee27de85668c8960068203c.zip | |
vte-gtk4: init
| -rw-r--r-- | pkgs/development/libraries/vte/default.nix | 9 | ||||
| -rw-r--r-- | 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 739328117a7..a2eec8092ab 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 664f95b56f2..b38c9c6ec07 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 { |