me
/
guix
Archived
1
0
Fork 0
Code

gnu: debootstrap: Patch reference to dpkg. 

* gnu/packages/debian.scm (debootstrap)[arguments]: Adjust 'patch-source
phase to also patch a reference to dpkg.
[inputs]: Add dpkg.
Efraim Flashner 2022-05-23 15:10:28 +03:00
parent 2bd17f8a15
commit 658525f6ec
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/packages/debian.scm
View File

@ -208,6 +208,7 @@ contains the archive keys used for that.")
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(tzdata (assoc-ref inputs "tzdata")) (tzdata (assoc-ref inputs "tzdata"))
(dpkg (assoc-ref inputs "dpkg"))
(debian (assoc-ref inputs "debian-keyring")) (debian (assoc-ref inputs "debian-keyring"))
(ubuntu (assoc-ref inputs "ubuntu-keyring"))) (ubuntu (assoc-ref inputs "ubuntu-keyring")))
(substitute* "Makefile" (substitute* "Makefile"
@ -224,7 +225,8 @@ contains the archive keys used for that.")
(substitute* "scripts/gutsy" (substitute* "scripts/gutsy"
(("/usr") ubuntu)) (("/usr") ubuntu))
(substitute* "debootstrap" (substitute* "debootstrap"
(("=/usr") (string-append "=" out))) (("=/usr") (string-append "=" out))
(("/usr/bin/dpkg") (string-append dpkg "/bin/dpkg")))
;; Ensure PATH works both in guix and within the debian chroot ;; Ensure PATH works both in guix and within the debian chroot
;; workaround for: https://bugs.debian.org/929889 ;; workaround for: https://bugs.debian.org/929889
(substitute* "functions" (substitute* "functions"
@ -252,6 +254,7 @@ contains the archive keys used for that.")
(inputs (inputs
`(("debian-keyring" ,debian-archive-keyring) `(("debian-keyring" ,debian-archive-keyring)
("ubuntu-keyring" ,ubuntu-keyring) ("ubuntu-keyring" ,ubuntu-keyring)
("dpkg" ,dpkg)
("tzdata" ,tzdata) ("tzdata" ,tzdata)
;; Called at run-time from various places, needs to be in PATH. ;; Called at run-time from various places, needs to be in PATH.