diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 12:51:57 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 13:11:40 -0400 |
| commit | 5e2140511c1ad9ccd731438b74d61b62111da1e6 (patch) | |
| tree | a4ff748ad26e121b88469b5d921001ef1382be8f /gnu/packages/hurd.scm | |
| parent | 9e3a5ee417ea7fe9721be8804ff047e80c4f22ed (diff) | |
| parent | 353bdae32f72b720c7ddd706576ccc40e2b43f95 (diff) | |
| download | guix-patches-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar guix-patches-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar.gz | |
Merge branch 'staging'
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/gdb.scm
gnu/packages/llvm.scm
gnu/packages/package-management.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/hurd.scm')
| -rw-r--r-- | gnu/packages/hurd.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 98fe594b7f..47c7e17573 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -157,6 +157,17 @@ for other software in the GNU system that uses Mach-based inter-process communication.") (license gpl2+))) +(define-public mig/32-bit + ;; When cross-compiling from x86_64-linux to i586-gnu, we need this 32-bit + ;; native MIG. + (package + (inherit mig) + (arguments + (substitute-keyword-arguments (package-arguments mig) + ((#:system _ #f) + "i686-linux"))) + (properties `((hidden? . #t))))) + (define-public hurd-headers ;; Resort to a post-0.9 snapshot that provides the 'file_utimens' and ;; 'file_exec_paths' RPCs that glibc 2.28 expects. @@ -536,9 +547,7 @@ exec ${system}/rc \"$@\" ("mig" ,(if (%current-target-system) ;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG, ;; hence this hack. - (package - (inherit mig) - (arguments `(#:system "i686-linux"))) + mig/32-bit mig)) ("perl" ,perl) ("texinfo" ,texinfo-4) |