From 90041e9c28e71ee9736b5e9942625460f7deacd2 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 2 Jun 2019 11:34:33 -0700 Subject: [PATCH] gnu: debootstrap: Workaround for PATH issues. * gnu/packages/debian (debootstrap): [arguments]: Substitute PATH to include $PATH. [description]: Remove obsolete workaround from description. --- gnu/packages/debian.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 1b401bc946..f94f49c51b 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -154,6 +154,11 @@ (define-public debootstrap (("/usr") ubuntu)) (substitute* "debootstrap" (("=/usr") (string-append "=" out))) + ;; Ensure PATH works both in guix and within the debian chroot + ;; workaround for: https://bugs.debian.org/929889 + (substitute* "functions" + (("PATH=/sbin:/usr/sbin:/bin:/usr/bin") + "PATH=$PATH:/sbin:/usr/sbin:/bin:/usr/bin")) (substitute* (find-files "scripts" ".") (("/usr/share/zoneinfo") (string-append tzdata "/share/zoneinfo"))) #t))) @@ -184,9 +189,5 @@ (define-public debootstrap (description "Debootstrap is used to create a Debian base system from scratch, without requiring the availability of @code{dpkg} or @code{apt}. It does this by downloading .deb files from a mirror site, and carefully -unpacking them into a directory which can eventually be chrooted into. - -It is recommended to run @code{debootstrap --foreign --arch=...} and then -@code{chroot} into the directory, set the PATH and run @code{debootstrap ---second-stage} after.") +unpacking them into a directory which can eventually be chrooted into.") (license license:gpl2)))