From 851ff8a5c587ff0d7e6f09a2a656503c2409d6c3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Jul 2017 17:01:45 -0400 Subject: gnu: wayland-protocols: Update to 1.9. * gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.9. --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a9a7e08da1..9dbb8c0869 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -393,7 +393,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") (define-public wayland-protocols (package (name "wayland-protocols") - (version "1.7") + (version "1.9") (source (origin (method url-fetch) (uri (string-append @@ -401,7 +401,7 @@ applications, X servers (rootless or fullscreen) or other display servers.") "wayland-protocols-" version ".tar.xz")) (sha256 (base32 - "07qw166s6bm81zfnhf4lmww6wj0il960fm3vp7n1z3rign9jlpv3")))) + "0xag2yci0l13brmq2k12vdv0wlnb2j0rxk2cnp170fya63g74sv6")))) (build-system gnu-build-system) (inputs `(("wayland" ,wayland))) -- cgit 1.4.1 From e76008dbc87744656f1d30672af681d864310e0d Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Tue, 22 Aug 2017 14:05:58 +0200 Subject: gnu: accountsservice: Properly reference shadow. * gnu/packages/freedesktop.scm (accountsservice): Fix references to binaries provided by the shadow package. --- gnu/packages/freedesktop.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index a9a7e08da1..b3d4279dc6 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015 Sou Bunnbu -;;; Copyright © 2015 Andy Wingo +;;; Copyright © 2015, 2017 Andy Wingo ;;; Copyright © 2015, 2016, 2017 Ludovic Courtès ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015 David Hashe @@ -645,10 +645,17 @@ message bus.") (modify-phases %standard-phases (add-before 'configure 'pre-configure - (lambda _ - ;; Don't try to create /var/lib/AccoutsService. + (lambda* (#:key inputs #:allow-other-keys) + ;; Don't try to create /var/lib/AccountsService. (substitute* "src/Makefile.in" (("\\$\\(MKDIR_P\\).*/lib/AccountsService.*") "true")) + (let ((shadow (assoc-ref inputs "shadow"))) + (substitute* '("src/user.c" "src/daemon.c") + (("/usr/sbin/usermod") (string-append shadow "/sbin/usermod")) + (("/usr/sbin/useradd") (string-append shadow "/sbin/useradd")) + (("/usr/sbin/userdel") (string-append shadow "/sbin/userdel")) + (("/usr/bin/passwd") (string-append shadow "/bin/passwd")) + (("/usr/bin/chage") (string-append shadow "/bin/chage")))) #t))))) (native-inputs `(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc. @@ -656,7 +663,8 @@ message bus.") ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("polkit" ,polkit))) + `(("shadow" ,shadow) + ("polkit" ,polkit))) (home-page "http://www.freedesktop.org/wiki/Software/AccountsService/") (synopsis "D-Bus interface for user account query and manipulation") (description -- cgit 1.4.1 From b9bf08f05805a733cb5fe89130d98c577cfe6089 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sat, 26 Aug 2017 12:07:10 +0200 Subject: gnu: Add xdg-user-dirs. * gnu/packages/freedesktop.scm (xdg-user-dirs): New public variable. --- gnu/packages/freedesktop.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages/freedesktop.scm') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b3d4279dc6..067d5be056 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1008,3 +1008,47 @@ desktop-file-install: installs a desktop file to the applications directory, update-desktop-database: updates the database containing a cache of MIME types handled by desktop files.") (license license:gpl2+))) + +(define-public xdg-user-dirs + (package + (name "xdg-user-dirs") + (version "0.16") + (source (origin + (method url-fetch) + (uri (string-append "http://user-dirs.freedesktop.org/releases/" + name "-" version ".tar.gz")) + (sha256 + (base32 "1rp3c94hxjlfsryvwajklynfnrcvxplhwnjqc7395l89i0nb83vp")))) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("docbook-xsl" ,docbook-xsl) + ("docbook-xml" ,docbook-xml-4.3) + ("xsltproc" ,libxslt))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'locate-catalog-files + (lambda* (#:key inputs #:allow-other-keys) + (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook")) + (xsldoc (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl)))) + (for-each (lambda (file) + (substitute* file + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd")))) + (find-files "man" "\\.xml$")) + (substitute* "man/Makefile" + (("http://.*/docbook\\.xsl") + (string-append xsldoc "/manpages/docbook.xsl"))) + #t)))))) + (home-page "https://www.freedesktop.org/wiki/Software/xdg-user-dirs/") + (synopsis "Tool to help manage \"well known\" user directories") + (description "xdg-user-dirs is a tool to help manage \"well known\" user +directories, such as the desktop folder or the music folder. It also handles +localization (i.e. translation) of the file names. Designed to be +automatically run when a user logs in, xdg-user-dirs can also be run +manually by a user.") + (license license:gpl2))) -- cgit 1.4.1