Commit Graph

22 Commits

Author SHA1 Message Date
Alexandre Esteves
29d41a5e41 dbus: fix build with llvm 22 2026-07-01 00:20:48 +01:00
Randy Eckenrode
171926f883 dbus: default to using tmpdir instead of launchd activation
This matches the default behavior on Linux. If D-Bus defaults to launchd
activation, all packages or tests using `dbus-run-session` will fail due
the launch agent not being installed and available.
2026-05-17 13:20:56 -04:00
Randy Eckenrode
329b59d07d dbus: fix install name on installed binaries
Some binaries have incorrect install names. They should be the absolute
path, but they have `@rpath` instead. This something that Meson should
handle automatically, but it’s not happening for these binaries.
2026-05-17 13:20:55 -04:00
Winter M
ac2efbaebf pkgsStatic.dbus: fix
Plausibly broken by 4db1e1cf13:

```
/nix/store/6iy5zryd4b8hmwpj9mky2by0ajardffk-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: /nix/store/jp3n4kccjv0zbz50kw3qbrlnfb0mp43d-audit-static-x86_64-unknown-linux-musl-4.1.2-unstable-2025-09-06-lib/lib/libaudit.a(libaudit.o): in function `audit_can_control':
(.text+0x36a8): undefined reference to `capng_save_state'
/nix/store/6iy5zryd4b8hmwpj9mky2by0ajardffk-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: (.text+0x36bb): undefined reference to `capng_have_capability'
/nix/store/6iy5zryd4b8hmwpj9mky2by0ajardffk-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: (.text+0x36c7): undefined reference to `capng_restore_state'
/nix/store/6iy5zryd4b8hmwpj9mky2by0ajardffk-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: /nix/store/jp3n4kccjv0zbz50kw3qbrlnfb0mp43d-audit-static-x86_64-unknown-linux-musl-4.1.2-unstable-2025-09-06-lib/lib/libaudit.a(libaudit.o): in function `audit_can_write':
(.text+0x3838): undefined reference to `capng_save_state'
/nix/store/6iy5zryd4b8hmwpj9mky2by0ajardffk-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: (.text+0x384b): undefined reference to `capng_have_capability'
/nix/store/6iy5zryd4b8hmwpj9mky2by0ajardffk-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: (.text+0x3857): undefined reference to `capng_restore_state'
/nix/store/6iy5zryd4b8hmwpj9mky2by0ajardffk-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: /nix/store/jp3n4kccjv0zbz50kw3qbrlnfb0mp43d-audit-static-x86_64-unknown-linux-musl-4.1.2-unstable-2025-09-06-lib/lib/libaudit.a(libaudit.o): in function `audit_can_read':
(.text+0x3898): undefined reference to `capng_save_state'
/nix/store/6iy5zryd4b8hmwpj9mky2by0ajardffk-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: (.text+0x38ab): undefined reference to `capng_have_capability'
/nix/store/6iy5zryd4b8hmwpj9mky2by0ajardffk-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: (.text+0x38b7): undefined reference to `capng_restore_state'
collect2: error: ld returned 1 exit status
```
2026-02-24 15:07:18 -05:00
Michael Daniels
c4514e94c0 dbus: fix darwin dynamic linking errors
Fixes darwin build of python3Packages.dbus-python (and likely others).
2026-02-22 12:06:36 -05:00
nixpkgs-ci[bot]
e217c74eac Merge staging-next into staging 2026-02-06 18:16:24 +00:00
Markus Sütter
196b385317 various: add meta.identifier.cpeParts to a batch of packages 2026-02-02 09:22:55 +01:00
Fernando Rodrigues
6308c3b213 various: switch to finalAttrs pattern (#483882) 2026-01-30 02:32:49 +00:00
quantenzitrone
6b61249106 various: switch to finalAttrs pattern
this shouldn't create any rebuilds
2026-01-30 02:36:22 +01:00
Randy Eckenrode
7a99191cf1 dbus: fix build on Darwin (#484428) 2026-01-27 21:13:42 +00:00
Philip Taron
8b12135314 dbus: add libcap_ng for libaudit support
The dbus meson.build requires both libaudit and libcap-ng when libaudit
support is enabled:

    have_libaudit = libaudit_ok and cap_ng_ok

While the audit package itself depends on libcap_ng, that dependency
doesn't make libcap_ng available in dbus's build environment. Adding it
explicitly fixes the build failure:

    Library cap-ng found: NO
    meson.build:556:8: ERROR: Problem encountered: libaudit support
    requested but not found
2026-01-27 11:40:46 -08:00
Randy Eckenrode
a967f2cd42 dbus: fix launchd support on Darwin
- Meson tries to detect that `launchctl` is present. Lie to it because
  it will always be present on a Darwin host platform; and
- Install the launch agent plist to `$out` instead of an impure path.
2026-01-27 12:00:26 -05:00
Randy Eckenrode
372961a73c dbus: fix vendored getgrouplist conditional
Without this patch, the vendored implementation of `getgrouplist` is
always used regardless of what is detected and set in `config.h`. The
function signature provided conflicts with the one in the SDK on Darwin.
Moving the condition to make it actually conditional fixes Darwin.
2026-01-27 12:00:00 -05:00
Randy Eckenrode
d964cb6440 dbus: make epoll, inotify, and systemd support conditional
These will be enabled by default due `-Dauto_features=enabled` being set
in Nixpkgs. However, not all of those features are available on every
platform supported by D-Bus, so set them conditionally.
2026-01-27 11:59:58 -05:00
Randy Eckenrode
0ef5ddf607 dbus: only set the path for systemctl on platforms that enable it 2026-01-27 11:59:04 -05:00
K900
3ac81a5564 Merge remote-tracking branch 'origin/staging-next' into staging 2026-01-26 21:15:56 +03:00
quantenzitrone
7d8132a92c treewide: remove references to the xorg namespace in pkgs (automated)
this creates some eval errors that will be fixed in the next commit

done with the following script:

```fish
\#!/usr/bin/env fish

set packagesjson (nix eval --impure --json --expr '
let
  lib = import ./lib;
in
import pkgs/servers/x11/xorg/default.nix (lib.mapAttrs (
  name: _:
  if name == "lib" then
    lib
  else if name == "config" then
    { allowAliases = false; }
  else
    name
) (__functionArgs (import pkgs/servers/x11/xorg/default.nix))) { }
' | jq)

set one (grep '^    [A-Za-z0-9_-]*$' pkgs/servers/x11/xorg/default.nix | string trim | string replace -r '$' Z | sort | string sub -e -1)
set two (grep '^  [A-Za-z0-9_-]* = [A-Za-z0-9_-]*;$' pkgs/servers/x11/xorg/default.nix | cut -d= -f1 | string trim | string replace -r '$' Z | sort | string sub -e -1)

for arg in $one $two
    set oname $arg
    set nname (echo $packagesjson | jq -r .$oname)

    if test $nname = null
        echo (set_color red)warn:(set_color normal) unknown package xorg.$oname >&2
        continue
    end

    echo $oname "->" $nname

    # replace basic xorg.$name references
    for file in (rg -F "xorg.$oname" --files-with-matches pkgs)
        # special cases
        sd -F "$oname = xorg.$oname;" "$nname = $nname;" $file

        # replace
        sd -F "xorg.$oname" "$nname" $file

        # fixup function arguments

        # prevent duplicate function args
        if grep -E " ($oname|$nname),\$" $file >/dev/null
            continue
        end

        if grep 'xorg\..' $file >/dev/null # case1: there is more so we can't just remove the function arg

            if grep ' xorg,$' $file >/dev/null
                sd ' xorg,$' " xorg,
                $nname," $file

            else if grep ' xorg ? .*,$' $file >/dev/null
                sd 'xorg( ? .*),$' "xorg\$1,
                $nname," $file

            else
                sd -F 'xorg,' "$nname,
                xorg," $file
            end

        else # case there is no more xorg..* so we can just replace the function arg
            sd 'xorg(| ? .*),.*$' "$nname," $file
        end
    end
end

nix fmt
```
2026-01-25 22:28:09 +01:00
quantenzitrone
c7c77c1aee treewide: remove all uses of 'with xorg;' in pkgs
this shouldn't create any rebuilds

this was done manually by grepping for `with xorg` and `with pkgs.xorg`
2026-01-25 22:26:00 +01:00
Jan Tojnar
c77362f3c6 dbus: 1.14.10 → 1.16.2
https://gitlab.freedesktop.org/dbus/dbus/-/compare/dbus-1.14.10...dbus-1.16.2

This includes:

- Switch from Autotools to Meson
  - Since Meson does not support separate `installFlags`, we would either need to use `DESTDIR`, or patch the build system. I chose the latter since we want to keep the `$out` as close to FHS as possible to avoid confusion, and moving a subset of content of `$out/etc` back to `$out/share` would be annoying.
  - `libaudit` started to require `libcap-ng`.
  - `xmlto` was replaced by `xsltproc`.
  - Extra docs builds, disabled for now due to dependency requirements.

In the package definition:

- Use `finalAttrs`.
- Use `--replace-fail` with `substitute`.
- Make `getgrouplist` unconditional.
2026-01-19 01:21:10 +01:00
Jan Tojnar
7b66a35a14 dbus: Reorder attributes
Move `postPatch` to the bottom and `outputs` to the top as per
https://github.com/jtojnar/nixpkgs-hammering/blob/main/explanations/attribute-ordering.md
2026-01-19 01:21:10 +01:00
Jan Tojnar
f82cda2388 dbus: Do not propagate expat
The propagation was introduced in 7d9607f151 without any context.
But the library is only used by dbus-daemon so it does not make sense to propagate it.
2026-01-19 01:21:10 +01:00
quantenzitrone
29b2325138 {dbus,makeDBusConf}: move to pkgs/by-name
this shouldn't create any rebuilds
2026-01-13 15:39:48 +01:00