nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-19 03:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #195264 from mweinelt/dbus-1.14.4

Browse Source
This commit is contained in:
Martin Weinelt 2022-10-09 23:14:22 +02:00 committed by GitHub
commit 4e58b28480
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
{ stdenv
, lib
, fetchpatch
, fetchurl
, pkg-config
, expat
@ -20,27 +19,16 @@
stdenv.mkDerivation rec {
pname = "dbus";
version = "1.14.0";
version = "1.14.4";
src = fetchurl {
url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz";
sha256 = "sha256-zNfM43WW4KGVWP1mSNEnKrQ/AR2AyGNa6o/QutWK69Q=";
sha256 = "sha256-fA+bjl7A/yR5OD5iwAhKOimvme3xUU6fZZuBsw1ONT4=";
};
patches = [
# Fix dbus-daemon crashing when running tests due to long XDG_DATA_DIRS.
# https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/302
(fetchpatch {
url = "https://gitlab.freedesktop.org/dbus/dbus/-/commit/b551b3e9737958216a1a9d359150a4110a9d0549.patch";
sha256 = "kOVjlklZzKvBZXmmrE1UiO4XWRoBLViGwdn6/eDH+DY=";
})
] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch);
patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
postPatch = ''
# We need to generate the file ourselves.
# https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/317
rm doc/catalog.xml
substituteInPlace bus/Makefile.am \
--replace 'install-data-hook:' 'disabled:' \
--replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':'