From 13d60d66d7f373e7b782204a2bdb9a1ed9f426f9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 26 Jan 2025 16:05:37 +0200 Subject: [PATCH] amtterm: allow compiling with gamt This adds a graphical version of amtterm, called `gamt`, which automatically gets built if gtk/gdk and vte are discovered. It's gated behind a `withGamt` flag, defaulting to false, and available as `gamt`. This follows the same logic as qcam. --- pkgs/by-name/am/amtterm/package.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/am/amtterm/package.nix b/pkgs/by-name/am/amtterm/package.nix index 6d6788cd2238..8e90685b40c3 100644 --- a/pkgs/by-name/am/amtterm/package.nix +++ b/pkgs/by-name/am/amtterm/package.nix @@ -3,10 +3,13 @@ lib, stdenv, makeWrapper, + gtk3, openssl, perl, perlPackages, pkg-config, + vte, + withGamt ? false, }: stdenv.mkDerivation (finalAttrs: { @@ -18,7 +21,12 @@ stdenv.mkDerivation (finalAttrs: { perl SOAPLite ]) - ++ [ openssl ]; + ++ [ openssl ] + + ++ lib.optionals withGamt [ + gtk3 + vte + ]; nativeBuildInputs = [ makeWrapper pkg-config diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 093dff485087..3c0963d06bed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8752,6 +8752,8 @@ with pkgs; protobuf = protobuf_21; }; + gamt = callPackage ../by-name/am/amtterm/package.nix { withGamt = true; }; + gcr = callPackage ../development/libraries/gcr { }; gcr_4 = callPackage ../development/libraries/gcr/4.nix { };