Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkgsMusl.colord: fix build #179682

Merged
merged 2 commits into from
Jul 11, 2022
Merged

pkgsMusl.colord: fix build #179682

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c80cbf
colord: use wrapGAppsHookNoGui
alyssais Jun 29, 2022
46339db
colord: make the daemon disablable
alyssais Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions pkgs/tools/misc/colord/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@
, ninja
, vala
, libgudev
, wrapGAppsHook
, wrapGAppsNoGuiHook
, shared-mime-info
, sane-backends
, docbook_xsl
, docbook_xsl_ns
, docbook_xml_dtd_412
, gtk-doc
, libxslt
, enableDaemon ? !stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isStatic
jtojnar marked this conversation as resolved.
Show resolved Hide resolved
}:

stdenv.mkDerivation rec {
Expand Down Expand Up @@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
"-Dlibcolordcompat=true"
"-Dsane=true"
"-Dvapi=true"
"-Ddaemon=${lib.boolToString enableDaemon}"
"-Ddaemon_user=colord"
];

Expand All @@ -72,7 +74,7 @@ stdenv.mkDerivation rec {
pkg-config
shared-mime-info
vala
wrapGAppsHook
wrapGAppsNoGuiHook
alyssais marked this conversation as resolved.
Show resolved Hide resolved
];

buildInputs = [
Expand All @@ -83,10 +85,11 @@ stdenv.mkDerivation rec {
gusb
lcms2
libgudev
polkit
sane-backends
sqlite
systemd
] ++ lib.optionals enableDaemon [
polkit
];

postInstall = ''
Expand Down