diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-11-01 13:05:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-01 13:05:41 +0000 |
| commit | 021a5cc6ab13fc87dff57b46b90beee400cc6e34 (patch) | |
| tree | 5812922fb24006b0bf2b5fef82ffef383716fa9c /pkgs/development | |
| parent | a0b037b863ca65420f81ac2391b413f6be1fc85c (diff) | |
| parent | feda3999095869684900ea82078036e6c3c7fd49 (diff) | |
| download | nixpkgs-021a5cc6ab13fc87dff57b46b90beee400cc6e34.tar nixpkgs-021a5cc6ab13fc87dff57b46b90beee400cc6e34.tar.gz nixpkgs-021a5cc6ab13fc87dff57b46b90beee400cc6e34.tar.bz2 nixpkgs-021a5cc6ab13fc87dff57b46b90beee400cc6e34.tar.lz nixpkgs-021a5cc6ab13fc87dff57b46b90beee400cc6e34.tar.xz nixpkgs-021a5cc6ab13fc87dff57b46b90beee400cc6e34.tar.zst nixpkgs-021a5cc6ab13fc87dff57b46b90beee400cc6e34.zip | |
Merge pull request #72400 from worldofpeace/fix/accountsservice
accountsservice: fix vendor extensions
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/accountsservice/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch | 22 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 11ac842342b..eb48aca80ee 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -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 { diff --git a/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch b/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch new file mode 100644 index 00000000000..4b5222c9552 --- /dev/null +++ b/pkgs/development/libraries/accountsservice/drop-prefix-check-extensions.patch @@ -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); |