From 1c80cbf38527e89a79963e9627399e481b344112 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 29 Jun 2022 09:59:17 +0000 Subject: [PATCH 1/2] colord: use wrapGAppsHookNoGui As far as I can tell, none of the colord applications are graphical. This change is important for Musl, where librsvg is not supported because rustc does not support dynamically-linked Musl[1]. [1]: https://github.com/NixOS/nixpkgs/issues/179242 --- pkgs/tools/misc/colord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index f3d7503b9c9d7..079f75c4ca86f 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -18,7 +18,7 @@ , ninja , vala , libgudev -, wrapGAppsHook +, wrapGAppsNoGuiHook , shared-mime-info , sane-backends , docbook_xsl @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { pkg-config shared-mime-info vala - wrapGAppsHook + wrapGAppsNoGuiHook ]; buildInputs = [ From 46339db687cb7daf92af20db1c14152ade29c4a1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 29 Jun 2022 09:48:50 +0000 Subject: [PATCH 2/2] colord: make the daemon disablable We can't build the daemon in pkgsMusl, because rustc does not support dynamic Musl targets[1]. But it still makes sense to support the rest of colord, because an application should still be able to link against it to talk to a colord daemon built in some other way (e.g. provided by a different distro). [1]: https://github.com/NixOS/nixpkgs/issues/179242 --- pkgs/tools/misc/colord/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 079f75c4ca86f..77d06a6848ac3 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -26,6 +26,7 @@ , docbook_xml_dtd_412 , gtk-doc , libxslt +, enableDaemon ? !stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { "-Dlibcolordcompat=true" "-Dsane=true" "-Dvapi=true" + "-Ddaemon=${lib.boolToString enableDaemon}" "-Ddaemon_user=colord" ]; @@ -83,10 +85,11 @@ stdenv.mkDerivation rec { gusb lcms2 libgudev - polkit sane-backends sqlite systemd + ] ++ lib.optionals enableDaemon [ + polkit ]; postInstall = ''