diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/development/libraries/dbus | |
parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/dbus')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/dbus/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/dbus/default.nix b/nixpkgs/pkgs/development/libraries/dbus/default.nix index 4480d197fa7c..1f1eff189598 100644 --- a/nixpkgs/pkgs/development/libraries/dbus/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbus/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchurl -, pkgconfig +, pkg-config , expat , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl , systemd @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" "doc" "man" ]; nativeBuildInputs = [ - pkgconfig + pkg-config docbook_xml_dtd_44 docbook-xsl-nons xmlto @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-user-session" "--enable-xml-docs" - "--libexecdir=${placeholder ''out''}/libexec" + "--libexecdir=${placeholder "out"}/libexec" "--datadir=/etc" "--localstatedir=/var" "--runstatedir=/run" @@ -87,8 +87,8 @@ stdenv.mkDerivation rec { "--with-session-socket-dir=/tmp" "--with-system-pid-file=/run/dbus/pid" "--with-system-socket=/run/dbus/system_bus_socket" - "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" - "--with-systemduserunitdir=${placeholder ''out''}/etc/systemd/user" + "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + "--with-systemduserunitdir=${placeholder "out"}/etc/systemd/user" ] ++ lib.optional (!x11Support) "--without-x" ++ lib.optionals (!stdenv.isDarwin) [ "--enable-apparmor" "--enable-libaudit" ]; @@ -103,8 +103,8 @@ stdenv.mkDerivation rec { doCheck = true; installFlags = [ - "sysconfdir=${placeholder ''out''}/etc" - "datadir=${placeholder ''out''}/share" + "sysconfdir=${placeholder "out"}/etc" + "datadir=${placeholder "out"}/share" ]; # it's executed from $lib by absolute path @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { daemon = dbus.out; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple interprocess messaging system"; homepage = "http://www.freedesktop.org/wiki/Software/dbus/"; license = licenses.gpl2Plus; # most is also under AFL-2.1 |