Skip to content

Commit

Permalink
accountsservice: clean up
Browse files Browse the repository at this point in the history
- Move patches to the customary location just below src.
- Add brief explanation comment to each patch.
- Correct license.
- Add freedesktop team to maintainers.
  • Loading branch information
jtojnar committed Feb 26, 2022
1 parent 5647149 commit 7614caf
Showing 1 changed file with 20 additions and 13 deletions.
33 changes: 20 additions & 13 deletions pkgs/development/libraries/accountsservice/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,24 @@ stdenv.mkDerivation rec {
sha256 = "IdRJwN6tilQ86o8R5x6wSWwDXXMOpIOTOXowKzpMfBo=";
};

patches = [
# Hardcode dependency paths.
(substituteAll {
src = ./fix-paths.patch;
inherit shadow coreutils;
})

# Do not try to create directories in /var, that will not work in Nix sandbox.
./no-create-dirs.patch

# Disable mutating D-Bus methods with immutable /etc.
./Disable-methods-that-change-files-in-etc.patch

# Do not ignore third-party (e.g Pantheon) extensions not matching FHS path scheme.
# Fixes https://github.com/NixOS/nixpkgs/issues/72396
./drop-prefix-check-extensions.patch
];

nativeBuildInputs = [
dbus
gettext
Expand Down Expand Up @@ -57,22 +75,11 @@ stdenv.mkDerivation rec {
patchShebangs meson_post_install.py
'';

patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit shadow coreutils;
})
./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
];

meta = with lib; {
description = "D-Bus interface for user account query and manipulation";
homepage = "https://www.freedesktop.org/wiki/Software/AccountsService";
license = licenses.gpl3;
maintainers = with maintainers; [ pSub ];
license = licenses.gpl3Plus;
maintainers = teams.freedesktop.members ++ (with maintainers; [ pSub ]);
platforms = platforms.linux;
};
}

0 comments on commit 7614caf

Please sign in to comment.