diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-06-22 21:03:19 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2014-06-22 21:32:16 +0200 |
| commit | 76672dd9e31e43a269c4ce20a950f9e49f408c8e (patch) | |
| tree | adac62c7cdebaf707e413b3a989a1f97e436e2e1 /pkgs/development/libraries/accountsservice | |
| parent | 686d847ee2a61507a50c2a4cd110c2c11cc8e209 (diff) | |
| download | nixpkgs-76672dd9e31e43a269c4ce20a950f9e49f408c8e.tar nixpkgs-76672dd9e31e43a269c4ce20a950f9e49f408c8e.tar.gz nixpkgs-76672dd9e31e43a269c4ce20a950f9e49f408c8e.tar.bz2 nixpkgs-76672dd9e31e43a269c4ce20a950f9e49f408c8e.tar.lz nixpkgs-76672dd9e31e43a269c4ce20a950f9e49f408c8e.tar.xz nixpkgs-76672dd9e31e43a269c4ce20a950f9e49f408c8e.tar.zst nixpkgs-76672dd9e31e43a269c4ce20a950f9e49f408c8e.zip | |
accountsservice: be consistent in naming (always two 's')
The package is (correctly) named 'accountsservice' (with two 's'), but the attribute and expression path lacked one 's'. Fix it.
Diffstat (limited to 'pkgs/development/libraries/accountsservice')
| -rw-r--r-- | pkgs/development/libraries/accountsservice/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/development/libraries/accountsservice/no-create-dirs.patch | 13 |
2 files changed, 40 insertions, 0 deletions
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix new file mode 100644 index 00000000000..0ff5466e5c4 --- /dev/null +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, glib, intltool, makeWrapper +, libtool, gobjectIntrospection, polkit, systemd, coreutils }: + +stdenv.mkDerivation rec { + name = "accountsservice-0.6.35"; + + src = fetchurl { + url = http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.35.tar.xz; + sha256 = "0f1hzl6hw56xvwgmd4yvmdyj15xj1fafw45pzv3qarww7h0wg8b5"; + }; + + buildInputs = [ pkgconfig glib intltool libtool makeWrapper + gobjectIntrospection polkit systemd ]; + + configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--localstatedir=/var" ]; + + patches = [ ./no-create-dirs.patch ]; + patchFlags = "-p0"; + + preFixup = '' + wrapProgram "$out/libexec/accounts-daemon" \ + --run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/users" \ + --run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/icons" + ''; + +} diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/pkgs/development/libraries/accountsservice/no-create-dirs.patch new file mode 100644 index 00000000000..a0c7ca23598 --- /dev/null +++ b/pkgs/development/libraries/accountsservice/no-create-dirs.patch @@ -0,0 +1,13 @@ +--- src/Makefile.in.orig 2014-04-23 22:30:00.276005326 +0200 ++++ src/Makefile.in 2014-04-23 22:30:16.809409113 +0200 +@@ -881,8 +881,8 @@ + gdbus-codegen --generate-c-code accounts-user-generated --c-namespace Accounts --interface-prefix=org.freedesktop.Accounts. $(top_srcdir)/data/org.freedesktop.Accounts.User.xml + + install-data-hook: +- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/users" +- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/icons" ++# $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/users" ++# $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/icons" + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. |