From 7a499ccc9616f81f079e97c323b334b4f80b9b7f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 26 Apr 2019 16:20:49 -0500 Subject: [PATCH] accountsservice: 0.6.54 -> 0.6.55 https://cgit.freedesktop.org/accountsservice/tag/?h=0.6.55 --- .../libraries/accountsservice/default.nix | 4 ++-- .../libraries/accountsservice/no-create-dirs.patch | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index b42240a26c4..c20167138b7 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/pkgs/development/libraries/accountsservice/no-create-dirs.patch index ef1a59b0249..0333f925d26 100644 --- a/pkgs/development/libraries/accountsservice/no-create-dirs.patch +++ b/pkgs/development/libraries/accountsservice/no-create-dirs.patch @@ -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: