Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d5db11ccbd6d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b72984e7a3a7
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 28, 2019

  1. dbus: enable building with musl 

    When building dbus with musl, it must not take systemd as a buildInput,
because systemd is not able to be build with musl.
    @cdepillabout @nh2
    cdepillabout authored and nh2 committed Oct 28, 2019
    Copy the full SHA
    b72984e View commit details
Showing with 9 additions and 5 deletions.
  1. +9 −5 pkgs/development/libraries/dbus/default.nix
14 changes: 9 additions & 5 deletions pkgs/development/libraries/dbus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
, fetchurl
, pkgconfig
, expat
, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
, systemd
, libX11 ? null
, libICE ? null
@@ -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";
@@ -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 = [