diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-02-19 04:43:53 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-02-28 15:18:35 +0100 |
commit | c8f398505010dd00e331a08a8944f2f4546e1f27 (patch) | |
tree | bbec6cedb74a50e8c60a97b471c8f04b2a63d11c | |
parent | 0ae8b8e8e1c1447be2a26593f897d33a1cdd49ca (diff) | |
download | nixpkgs-c8f398505010dd00e331a08a8944f2f4546e1f27.tar nixpkgs-c8f398505010dd00e331a08a8944f2f4546e1f27.tar.gz nixpkgs-c8f398505010dd00e331a08a8944f2f4546e1f27.tar.bz2 nixpkgs-c8f398505010dd00e331a08a8944f2f4546e1f27.tar.lz nixpkgs-c8f398505010dd00e331a08a8944f2f4546e1f27.tar.xz nixpkgs-c8f398505010dd00e331a08a8944f2f4546e1f27.tar.zst nixpkgs-c8f398505010dd00e331a08a8944f2f4546e1f27.zip |
colord-gtk4: split out of colord-gtk
-rw-r--r-- | pkgs/tools/misc/colord-gtk/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index 097605026ee..a97d2af5603 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 66e474e39b4..393946de6c3 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 { }; |