From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxim Cournoyer Subject: Re: [PATCH 5/7] gnu: Add gnome-disk-utility. Date: Sat, 04 Feb 2017 21:53:36 -0800 Message-ID: <87zii189pb.fsf@gmail.com> References: <20170201233531.2640-1-david@craven.ch> <20170201233531.2640-5-david@craven.ch> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caFlg-0005rs-5q for guix-devel@gnu.org; Sun, 05 Feb 2017 00:53:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1caFlf-0008Ic-5I for guix-devel@gnu.org; Sun, 05 Feb 2017 00:53:44 -0500 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:33167) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1caFle-0008IA-SP for guix-devel@gnu.org; Sun, 05 Feb 2017 00:53:43 -0500 Received: by mail-pg0-x243.google.com with SMTP id 194so5929015pgd.0 for ; Sat, 04 Feb 2017 21:53:42 -0800 (PST) In-Reply-To: <20170201233531.2640-5-david@craven.ch> (David Craven's message of "Thu, 2 Feb 2017 00:35:29 +0100") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: David Craven Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi David, David Craven writes: > * gnu/packages/gnome.scm (gnome-disk-utility): New variable. > --- > gnu/packages/gnome.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++= ++++++ > 1 file changed, 50 insertions(+) > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index 5fbd0c111..955ac610a 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -321,6 +321,56 @@ Gnome project. It includes xml2po tool which makes = it easier to translate > and keep up to date translations of documentation.") > (license license:gpl2+))) ; xslt under lgpl >=20=20 > +(define-public gnome-disk-utility > + (package > + (name "gnome-disk-utility") > + (version "3.22.1") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://gnome/sources/" name "/" > + (version-major+minor version) "/" > + name "-" version ".tar.xz")) > + (sha256 > + (base32 > + "1hqynlcgwm72il2rdml98gcarz0alsgxs5xf6ww2x0czaj3s3953"))= )) > + (build-system gnu-build-system) > + (native-inputs > + `(("glib:bin" ,glib "bin") > + ("intltool" ,intltool) > + ("pkg-config" ,pkg-config) > + ("docbook-xml" ,docbook-xml) > + ("docbook-xsl" ,docbook-xsl) > + ("libxslt" ,libxslt))) > + (inputs > + `(("glib" ,glib) > + ("appstream-glib" ,appstream-glib) > + ("gnome-settings-daemon" ,gnome-settings-daemon) > + ("gtk+" ,gtk+) > + ("libcanberra" ,libcanberra) > + ("libdvdread" ,libdvdread) > + ("libnotify" ,libnotify) > + ("libpwquality" ,libpwquality) > + ("libsecret" ,libsecret) > + ("udisks" ,udisks))) > + (arguments > + `(#:phases > + (modify-phases %standard-phases > + (add-before 'configure 'fix-docbook > + (lambda* (#:key inputs #:allow-other-keys) > + (substitute* "doc/man/Makefile.in" > + (("http://docbook.sourceforge.net/release/xsl/current/man= pages/docbook.xsl") > + (string-append (assoc-ref inputs "docbook-xsl") > + "/xml/xsl/docbook-xsl-" > + ,(package-version docbook-xsl) > + "/manpages/docbook.xsl"))) > + (setenv "XML_CATALOG_FILES" > + (string-append (assoc-ref inputs "docbook-xml") > + "/xml/dtd/docbook/catalog.xml"))))))) I think it would be more elegant to pass the XML_CATALOG_FILES variable by using the #;make-flags keyworded argument. XML_CATALOG_FILES can also contain both the xml & xsl catalogs (the items are to be space separated), which means no substitute* call are needed. See the commit aef5055ff9 which does that. > + (home-page "https://git.gnome.org/browse/gnome-disk-utility") > + (synopsis "Disk management utility for GNOME") > + (description "Disk management utility for GNOME.") > + (license license:gpl2))) This should be gpl2+ (see files headers, such as: https://git.gnome.org/browse/gnome-disk-utility/tree/src/disks/gduapplicati= on.c) > + > (define-public gcr > (package > (name "gcr") Thanks for this contribution! Maxim --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEJ9WGpPiQCFQyn/CfEmDkZILmNWIFAliWveAACgkQEmDkZILm NWK3XxAAhNz5KiGV5GETMqmEWeml/iePUoHDezv+Xl0MhyOW/0wxsIYI8GgYAZS3 kK4soolokrkXgRGN0zVLpkSI5HtmfKkINCHtJFT+Dvh0GOKrcXfChMlfvsGRlbhk BlWOAv/o4mOY3n4w6WeE/1XppzGxgWdc3RSZqa4uaFbbG+0dT5MwbFU2nyaayXt+ giiZYIghKbUPInixRi2tWb1Gpq7QwZzRDs6ezTdrtva7Cv9b9Mn+zcqz5fmmg6Uz N93Mtwqo9rA0f2t6AYUwyKPUQUvgH+YpMaMIZUCfnGSKgjr539rA0TGSTiDpmYxM bMpvyMU7kh210XPWMA1gw1PxxGw05pp1m8FBFc6maLn+5ZAnKznahAD/hIq3U1Bv XTXBWKZs1QbOVFp5rumbPltS6M3XQIZ/JyJENQOA+NReHlNzKPukuGVYo4j07L7M pUA0Ss5J5iRtOxd/M84VpM0dDkZi9+FuCQJxrXLiUWnKYz0Mo+T0uJL4yOV0JiKR VM2KoOWgI9RQJb3wntNgUXDaAX05u5OsetsBC7QgQ+kqUvK1DgV07A/GgVRDU4N4 XMihaMGdJhq/MNnPYozAFEEkNXKYJw9DyNVyvHX6QtR9JC3XwdP4LnPwzOJ2255y GSWulX/vjC+hGFt3kwhkLsp+mreIDIA1DFXEttag7pq7MOnrP6Y= =wHd+ -----END PGP SIGNATURE----- --=-=-=--