From 0ae8b8e8e1c1447be2a26593f897d33a1cdd49ca Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 Feb 2022 04:36:14 +0100 Subject: [PATCH] libnma-gtk4: Add GTK4 variant --- pkgs/tools/networking/networkmanager/libnma/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 7 insertions(+) diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index 9cee2fbdab07..c039b47d169c 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -15,6 +15,8 @@ , mobile-broadband-provider-info , gobject-introspection , gtk3 +, withGtk4 ? false +, gtk4 , withGnome ? true , gcr , glib @@ -56,6 +58,8 @@ stdenv.mkDerivation rec { networkmanager isocodes mobile-broadband-provider-info + ] ++ lib.optionals withGtk4 [ + gtk4 ] ++ lib.optionals withGnome [ # advanced certificate chooser gcr @@ -63,6 +67,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgcr=${lib.boolToString withGnome}" + "-Dlibnma_gtk4=${lib.boolToString withGtk4}" ]; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a24c732b9484..66e474e39b4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8156,6 +8156,8 @@ with pkgs; libnma = callPackage ../tools/networking/networkmanager/libnma { }; + libnma-gtk4 = libnma.override { withGtk4 = true; }; + networkmanager_dmenu = callPackage ../tools/networking/networkmanager/dmenu { }; nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { };