From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyril Roelandt Subject: [PATCH 2/4 v2] gnu: Python: use /nix/.../sh instead of /bin/sh in the subprocess module Date: Sat, 22 Mar 2014 04:36:16 +0100 Message-ID: <1395459376-18754-1-git-send-email-tipecaml@gmail.com> References: <87fvmubbiv.fsf@gnu.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WRCov-0008H6-0Z for guix-devel@gnu.org; Fri, 21 Mar 2014 23:42:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WRCoo-00030p-Dx for guix-devel@gnu.org; Fri, 21 Mar 2014 23:42:04 -0400 Received: from mail-wg0-x22c.google.com ([2a00:1450:400c:c00::22c]:35559) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WRCoo-00030f-7O for guix-devel@gnu.org; Fri, 21 Mar 2014 23:41:58 -0400 Received: by mail-wg0-f44.google.com with SMTP id m15so2076706wgh.3 for ; Fri, 21 Mar 2014 20:41:57 -0700 (PDT) In-Reply-To: <87fvmubbiv.fsf@gnu.org> 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * gnu/packages/python.scm (python-2): patch Lib/subprocess.py to use /nix/.../sh. --- gnu/packages/python.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 056956e..2c69926 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -139,7 +139,15 @@ (with-directory-excursion out (for-each (cut augment-rpath <> lib) (find-files "bin" ".*"))))) - %standard-phases))) + (alist-replace + 'configure + (lambda* (#:key outputs #:allow-other-keys #:rest args) + (let ((configure (assoc-ref %standard-phases 'configure))) + (substitute* "Lib/subprocess.py" + (("args = \\[\"/bin/sh") + (string-append "args = [\"" (which "sh")))) + (apply configure args))) + %standard-phases)))) (inputs `(("bzip2" ,bzip2) ("gdbm" ,gdbm) -- 1.8.4.rc3