From c8f398505010dd00e331a08a8944f2f4546e1f27 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 19 Feb 2022 04:43:53 +0100 Subject: [PATCH] colord-gtk4: split out of colord-gtk --- pkgs/tools/misc/colord-gtk/default.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index 097605026ee3..a97d2af56035 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -12,6 +12,7 @@ , docbook_xml_dtd_412 , libxslt , glib +, withGtk4 ? false , gtk3 , gtk4 , pkg-config @@ -49,8 +50,15 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ colord - gtk3 + ] ++ (if withGtk4 then [ gtk4 + ] else [ + gtk3 + ]); + + mesonFlags = [ + "-Dgtk4=${lib.boolToString withGtk4}" + "-Dgtk3=${lib.boolToString (!withGtk4)}" ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66e474e39b4e..393946de6c34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4212,6 +4212,8 @@ with pkgs; colord-gtk = callPackage ../tools/misc/colord-gtk { }; + colord-gtk4 = colord-gtk.override { withGtk4 = true; }; + colordiff = callPackage ../tools/text/colordiff { }; connect = callPackage ../tools/networking/connect { };