From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBpLb-0005n7-J0 for guix-patches@gnu.org; Fri, 19 May 2017 17:22:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBpLW-0008CW-KH for guix-patches@gnu.org; Fri, 19 May 2017 17:22:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:53005) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dBpLW-0008CS-9u for guix-patches@gnu.org; Fri, 19 May 2017 17:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dBpLW-0006Hc-4y for guix-patches@gnu.org; Fri, 19 May 2017 17:22:02 -0400 Subject: bug#26924: [PATCH 10/10] gnu: calibre: Don't create uninstaller. Resent-Message-ID: From: Marius Bakke In-Reply-To: References: Date: Fri, 19 May 2017 23:21:39 +0200 Message-ID: <87o9uoa6fw.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Brendan Tildesley , 26924@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Brendan Tildesley writes: > From 9317684cdc23bcf6edb8f38abf5f057b319a0a68 Mon Sep 17 00:00:00 2001 > From: Brendan Tildesley > Date: Tue, 16 May 2017 10:53:44 +1000 > Subject: [PATCH 10/10] gnu: calibre: Don't create uninstaller. > > gnu/packages/ebook.scm (calibre). Don't create uninstaller. > --- > gnu/packages/ebook.scm | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm > index 289c2d07d..cca5e7895 100644 > --- a/gnu/packages/ebook.scm > +++ b/gnu/packages/ebook.scm > @@ -84,6 +84,8 @@ > (delete-file-recursively "resources/fonts/liberation") > (delete-file-recursively "src/chardet") > (substitute* (find-files "." "\\.py") > + ;; We can't use the uninstaller in Guix. Don't build it. > + (("self\\.create_uninstaller()") "") I moved this to a phase instead since 'snippets' affects the result of `guix build -S`. We try to keep the original source code as original as possible, and apply guix-specific tweaks in phases instead.=20 Sorry I missed it the first round, and thanks for finding it! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkfYeMACgkQoqBt8qM6 VPoUlQf/UGNjO0lNQyCy+V0gBUZ6WzVHGUP0XwRtAqUYcZB+nI1IEdMcewUdXrja R6lMGP5XoNP6PgoV75VIWIYtnbPx+OFKx/he5TIHZf5fq714EI+G9Xo5xLAVtnMp ryoUQzI2nmJRSIKR0i3PotrPcUK498F03SZiJM5ToID5PUBUfVwNFULewaHDpVAu aQnpeuMv8Qk3oVEObChJqGNRnhgoz5pl8M+euFXVD8DZWAUHhfuOz5EdpbNuZ5M0 XE9Do76taUhcXtKbBF2/YGZCrOgZ+SKjEQgi5erDY6up3YuOjrXNCUn56ttovWXH wWaKPRt3HiEe9c24DmtyGL6O9zwXJw== =dJba -----END PGP SIGNATURE----- --=-=-=--