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

dbus: enable building with musl #71560

Merged
merged 1 commit into from
Oct 28, 2019
Merged

dbus: enable building with musl #71560

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions pkgs/development/libraries/dbus/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
, fetchurl
, pkgconfig
, expat
, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
, systemd
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I set systemd to systemd ? null as it is done for libusb1?

https://github.com/NixOS/nixpkgs/pull/71563/files#diff-81a3f0c1548ebc7ea522eb8c443aaa01R5

, libX11 ? null
, libICE ? null
Expand All @@ -15,6 +16,8 @@ assert
x11Support ->
libX11 != null && libICE != null && libSM != null;

assert enableSystemd -> systemd != null;

stdenv.mkDerivation rec {
pname = "dbus";
version = "1.12.16";
Expand Down Expand Up @@ -50,11 +53,12 @@ stdenv.mkDerivation rec {
expat
];

buildInputs = lib.optionals x11Support [
libX11
libICE
libSM
] ++ lib.optional stdenv.isLinux systemd;
buildInputs =
lib.optionals x11Support [
libX11
libICE
libSM
] ++ lib.optional enableSystemd systemd;
# ToDo: optional selinux?

configureFlags = [
Expand Down