mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 00:22:13 +00:00
Code Issues Wiki Activity

Merge pull request #72400 from worldofpeace/fix/accountsservice

Browse source 
accountsservice: fix vendor extensions
This commit is contained in:
worldofpeace 2019-11-01 13:05:41 +00:00 committed by GitHub
parent a0b037b863 feda399909
commit 021a5cc6ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/accountsservice/default.nix
View file

@ -60,6 +60,8 @@ stdenv.mkDerivation rec {
})
./no-create-dirs.patch
./Disable-methods-that-change-files-in-etc.patch
# Fixes https://github.com/NixOS/nixpkgs/issues/72396
./drop-prefix-check-extensions.patch
# Systemd unit improvements. Notably using StateDirectory eliminating the
# need of an ad-hoc script.
(fetchpatch {

22
pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch Normal file
View file

@ -0,0 +1,22 @@
diff --git a/src/extensions.c b/src/extensions.c
index 038dcb2..830465d 100644
--- a/src/extensions.c
+++ b/src/extensions.c
@@ -121,16 +121,7 @@ daemon_read_extension_directory (GHashTable *ifaces,
continue;
}
- /* Ensure it looks like "../../dbus-1/interfaces/${name}" */
- const gchar * const prefix = "../../dbus-1/interfaces/";
- if (g_str_has_prefix (symlink, prefix) && g_str_equal (symlink + strlen (prefix), name)) {
- daemon_read_extension_file (ifaces, filename);
- }
- else {
- g_warning ("Found accounts service vendor extension symlink %s, but it must be exactly "
- "equal to '../../dbus-1/interfaces/%s' for forwards-compatibility reasons.",
- filename, name);
- }
+ daemon_read_extension_file (ifaces, filename);
}
g_dir_close (dir);