From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdKmT-0006i0-UP for guix-patches@gnu.org; Wed, 11 Jul 2018 15:28:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdKmR-0008Ol-1X for guix-patches@gnu.org; Wed, 11 Jul 2018 15:28:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:48022) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdKmQ-0008Of-UX for guix-patches@gnu.org; Wed, 11 Jul 2018 15:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fdKmQ-0008B1-PC for guix-patches@gnu.org; Wed, 11 Jul 2018 15:28:02 -0400 Subject: [bug#32102] [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases. Resent-Message-ID: From: Arun Isaac Date: Thu, 12 Jul 2018 00:56:52 +0530 Message-Id: <20180711192652.20186-3-arunisaac@systemreboot.net> In-Reply-To: <20180711192652.20186-1-arunisaac@systemreboot.net> References: <20180711192652.20186-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: clement@lassieur.org Cc: mhw@netris.org, 32102@debbugs.gnu.org * gnu/packages/messaging.scm (gajim)[arguments]: Combine wrap-program phases into a single wrap-gajim phase. --- gnu/packages/messaging.scm | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index cdcd1225f..89946a685 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Mekeor Melire -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2018 Arun Isaac ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Rutger Helling @@ -586,17 +586,6 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each - (lambda (name) - (let ((file (string-append out "/bin/" name)) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (wrap-program file - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))) - '("gajim" "gajim-remote" "gajim-history-manager"))) - #t)) (add-before 'check 'remove-test-resolver ;; This test requires network access. (lambda _ @@ -628,14 +617,22 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") (symlink adwaita "Adwaita") (copy-recursively hicolor "hicolor"))) #t)) - (add-after 'install-icons 'wrap-program + (add-after 'install-icons 'wrap-gajim (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/gajim") - ;; For GtkFileChooserDialog. - `("GSETTINGS_SCHEMA_DIR" = - (,(string-append (assoc-ref inputs "gtk+") - "/share/glib-2.0/schemas"))))))))) + (let ((out (assoc-ref outputs "out"))) + (for-each + (lambda (name) + (let ((file (string-append out "/bin/" name)) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program file + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))) + '("gajim" "gajim-remote" "gajim-history-manager")) + (wrap-program (string-append out "/bin/gajim") + ;; For GtkFileChooserDialog. + `("GSETTINGS_SCHEMA_DIR" = + (,(string-append (assoc-ref inputs "gtk+") + "/share/glib-2.0/schemas"))))) + #t))))) (native-inputs `(("intltool" ,intltool) ("xorg-server" ,xorg-server))) -- 2.15.1