public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dbus: enable building with musl

Browse Source 
When building dbus with musl, it must not take systemd as a buildInput,
because systemd is not able to be build with musl.
This commit is contained in:
(cdep)illabout 2019-10-21 13:09:32 -04:00 committed by Niklas Hambüchen
parent d5db11ccbd
commit b72984e7a3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/dbus/default.nix
View File

@ -3,6 +3,7 @@
, fetchurl , fetchurl
, pkgconfig , pkgconfig
, expat , expat
, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
, systemd , systemd
, libX11 ? null , libX11 ? null
, libICE ? null , libICE ? null
@ -15,6 +16,8 @@ assert
x11Support -> x11Support ->
libX11 != null && libICE != null && libSM != null; libX11 != null && libICE != null && libSM != null;
assert enableSystemd -> systemd != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dbus"; pname = "dbus";
version = "1.12.16"; version = "1.12.16";
@ -50,11 +53,12 @@ stdenv.mkDerivation rec {
expat expat
]; ];
buildInputs = lib.optionals x11Support [ buildInputs =
libX11 lib.optionals x11Support [
libICE libX11
libSM libICE
] ++ lib.optional stdenv.isLinux systemd; libSM
] ++ lib.optional enableSystemd systemd;
# ToDo: optional selinux? # ToDo: optional selinux?
configureFlags = [ configureFlags = [