Merge pull request #60293 from dtzWill/update/accountsservice-0.6.55

accountsservice: 0.6.54 -> 0.6.55
This commit is contained in:
Will Dietz 2019-04-27 19:55:46 -05:00 committed by GitHub
commit afebfeca44
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "accountsservice-${version}";
version = "0.6.54";
version = "0.6.55";
src = fetchurl {
url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
sha256 = "1b115n0a4yfa06kgxc69qfc1rc0w4frgs3id3029czkrhhn0ds96";
sha256 = "16wwd633jak9ajyr1f1h047rmd09fhf3kzjz6g5xjsz0lwcj8azz";
};
nativeBuildInputs = [ pkgconfig makeWrapper meson ninja python3 ];

View file

@ -1,15 +1,15 @@
diff --git a/meson_post_install.py b/meson_post_install.py
index ba95055..17f7926 100644
index 5cc2dc4..dd27ad5 100644
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1])
# FIXME: meson will not track the creation of these directories
# https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39
dst_dirs = [
- os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'),
- os.path.join(localstatedir, 'lib', 'AccountsService', 'users'),
+ #os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'),
+ #os.path.join(localstatedir, 'lib', 'AccountsService', 'users'),
- (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775),
- (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700),
+# (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775),
+# (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700),
]
for dst_dir in dst_dirs:
for (dst_dir, dst_dir_mode) in dst_dirs: