From patchwork Tue Jul 26 10:10:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Tropin X-Patchwork-Id: 41002 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5533E27BBEA; Tue, 26 Jul 2022 12:32:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1CD5227BBE9 for ; Tue, 26 Jul 2022 12:32:33 +0100 (BST) Received: from localhost ([::1]:41472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGIng-0005fI-5x for patchwork@mira.cbaines.net; Tue, 26 Jul 2022 07:32:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGIiM-0007sn-LF for guix-patches@gnu.org; Tue, 26 Jul 2022 07:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34397) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGIiM-0005sQ-5z for guix-patches@gnu.org; Tue, 26 Jul 2022 07:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oGIiM-0005TU-0b for guix-patches@gnu.org; Tue, 26 Jul 2022 07:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56781] [PATCH] home: Add explicit dependency on env to activation script. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Jul 2022 11:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56781 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56781@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165883476220959 (code B ref -1); Tue, 26 Jul 2022 11:27:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jul 2022 11:26:02 +0000 Received: from localhost ([127.0.0.1]:52379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGIhO-0005Rz-CL for submit@debbugs.gnu.org; Tue, 26 Jul 2022 07:26:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:47554) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGIhL-0005RX-Tc for submit@debbugs.gnu.org; Tue, 26 Jul 2022 07:26:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGIhI-0007KU-F9 for guix-patches@gnu.org; Tue, 26 Jul 2022 07:25:57 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:43217) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGIhF-0005cR-Uo for guix-patches@gnu.org; Tue, 26 Jul 2022 07:25:55 -0400 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id A82C060002 for ; Tue, 26 Jul 2022 11:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1658834748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=CNAfT/86oRcYHODSgM2UBfjJpwcg/QMc8sPC3od/mSY=; b=V4og8CO95cJf4UciaY7uR6J2eDqCxGzGHTVfYq3EgOV7ZgBWY6OgaKCOafR+3HHu36Xaqf 72qSqWziAcRMgJW5/DdEY8VgL6pTws6hCJTnTX03BMu3ZF3IU4Tz/V9knPsoyvVQ3aIW9l Nd4q9AlM8ytZW8iSdRL7dEZis1pEX5Mm04Z3fKnvngbMOGdCv5ZWWbJXhTnJW4Sj/L+Fnc /o++YmKOvmVuYYHy4KgZ3MVKshH8OceOkShCg/FtByiDLldOTW+OhvGA0vc5QfM3vxgJiv jngx21g7UytqdW82OMN2PPb+yucBOWj967+ebTke9Vn4gLOkgXR7JnF6YV1Dcg== From: Andrew Tropin Date: Tue, 26 Jul 2022 13:10:08 +0300 Message-ID: <87pmhsyv2g.fsf@trop.in> MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.183.195; envelope-from=andrew@trop.in; helo=relay3-d.mail.gandi.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/home/services.scm (compute-activation-script): Add explicit dependency on env to activation script. --- gnu/home/services.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/home/services.scm b/gnu/home/services.scm index d500ba8c68..61a7419f4e 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -20,6 +20,7 @@ (define-module (gnu home services) #:use-module (gnu services) #:use-module ((gnu packages package-management) #:select (guix)) + #:use-module ((gnu packages base) #:select (coreutils)) #:use-module (guix channels) #:use-module (guix monads) #:use-module (guix store) @@ -427,8 +428,9 @@ (define (compute-activation-script init-gexp gexps) #f)))) (if (file-exists? (he-init-file new-home)) (let* ((port ((@ (ice-9 popen) open-input-pipe) - (format #f "source ~a && env -0" - (he-init-file new-home)))) + (format #f "source ~a && ~a -0" + (he-init-file new-home) + #$(file-append coreutils "/bin/env")))) (result ((@ (ice-9 rdelim) read-delimited) "" port)) (vars (map (lambda (x) (let ((si (string-index x #\=)))