diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-12-20 18:39:04 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-12-20 18:39:04 +0100 |
| commit | 86974d8a9247cbeb938b5202f23ccca8d9ed627d (patch) | |
| tree | 7bd498ccf672aced617aa24a830ec4164268c03f /gnu/packages/base.scm | |
| parent | 03a45a40227d97ccafeb49c4eb0fc7539f4d2127 (diff) | |
| parent | 9012d226fa46229a84e49a42c9b6d287105dfddf (diff) | |
| download | guix-patches-86974d8a9247cbeb938b5202f23ccca8d9ed627d.tar guix-patches-86974d8a9247cbeb938b5202f23ccca8d9ed627d.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 156399adbb..64f60a928e 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -682,6 +682,18 @@ store.") #:tests? #f ; XXX #:phases (modify-phases %standard-phases + ,@(if (hurd-target?) + `((add-after 'unpack 'apply-hurd-patch + (lambda* (#:key inputs native-inputs + #:allow-other-keys) + ;; TODO: Move this to 'patches' field. + (let ((patch (or (assoc-ref native-inputs + "hurd-magic-pid-patch") + (assoc-ref inputs + "hurd-magic-pid-patch")))) + (invoke "patch" "-p1" "--force" "--input" + patch))))) + '()) (add-before 'configure 'pre-configure (lambda* (#:key inputs native-inputs outputs @@ -807,7 +819,9 @@ store.") ,@(if (hurd-target?) `(("mig" ,mig) - ("perl" ,perl)) + ("perl" ,perl) + ("hurd-magic-pid-patch" + ,(search-patch "glibc-hurd-magic-pid.patch"))) '()))) (native-search-paths |