me
/
guix
Archived
1
0
Fork 0
Commit Graph

84348 Commits (283bc45649652c060786f287a59f31849979df83)

Author SHA1 Message Date
Maxime Devos 283bc45649
gnu: isc-dhcp: Make an input unconditional.
* gnu/packages/admin.scm (isc-dhcp)[inputs]{bash}: Always include this
  input, even when compiling natively.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:03 +00:00
Maxime Devos 9ca2f94b1b
gnu: isc-dhcp: Don't use canonical-package.
As I understand it, canonical-package is only for things that
won't end up in the closure, so canonical-package shouldn't be
used here.

* gnu/packages/admin.scm (isc-dhcp)[inputs]{bash}: Remove 'canonical-package'.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:02 +00:00
Maxime Devos 034459cc67
gnu: mozjs: Make the quasiquote unconditional.
* gnu/packages/nss.scm (mozjs-60)[arguments]<#:configure-flags>: Always use
  quasiquote instead of quote.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:02 +00:00
Maxime Devos e3d61d2082
gnu: mozjs: Make the native-inputs unconditional.
* gnu/packages/nss.scm (mozjs)[inputs]: Always include 'perl" and
  'bash-minimal', even when compiling natively.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:02 +00:00
Maxime Devos 8a55fde935
build/minetest-build-system: Move png-file? to (guix build utils).
It's not really Minetest-specific.  It was only placed in
(guix build minetest-build-system) to avoid a world rebuild.

* guix/build/minetest-build-system.scm (%png-magic-bytes,png-file?):
  Move to ...
* guix/build/utils.scm (%png-magic-bytes,png-file?): ... here.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:02 +00:00
Maxime Devos 9bf0652b08
gnu: icecat: Use mozilla-build-system.
This doesn't actually have any effect because the 'configure'
phase is replaced.

* gnu/packages/gnuzilla.scm (icecat)[build-system]: Use mozilla-build-system.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:02 +00:00
Maxime Devos 5d8515b337
gnu: mozjs: Use mozilla-build-system.
Due to the use of 'inherit', all versions of mozjs are adjusted.

* gnu/packages/gnuzilla.scm
  (mozjs)[build-system]: Adjust it.
  (mozjs)[arguments]<#:configure-flags>: Remove now superfluous --target and
  --host.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:02 +00:00
Maxime Devos 385ba2f369
gnu: nspr: Use mozilla-build-system.
* gnu/packages/nss.scm
  (nspr)[build-system]: Adjust it.
  (nspr)[arguments]<#:configure-flags>: Remove now superfluous --target and
  --host.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:02 +00:00
Maxime Devos fae2fcdbc9
build-system/mozilla: New build system.
* guix/build-system/mozilla.scm
  (lower-mozilla): New procedure.
  (mozilla-build-system): New variable.
* Makefile.am (MODULES): Add it.
* doc/guix.texi (Build Systems): Document it.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-10-02 11:00:01 +00:00
Mathieu Othacehe 0cccc2f52c
Merge remote-tracking branch core-updates-frozen into core-updates 2021-09-22 06:25:20 +00:00
Mathieu Othacehe d58e52b071
installer: keymap: Fix optional fields handling.
Fixes: <https://issues.guix.gnu.org/50723>.

The keymap xml contains optional shortDescription and description fields. The
assoc-ref call on those fields can return false, handle it correctly.

* gnu/installer/keymap.scm (xkb-rules->models+layouts): Introduce a new
"maybe-empty" helper to deal with optional fields. Use it for shortDescription
and description fields.
2021-09-21 20:35:49 +00:00
Felix Gruber a3324e5753
gnu: 4dtris: Fix build.
* gnu/packages/games.scm (4dtris)[attributes]: Add -fcommon to CFLAGS
  and use search-input-directory to find SDL include path.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-09-21 13:50:53 +00:00
Ludovic Courtès f762d63ec0
gnu: cmake: Skip CPack TXZ test on i686.
Fixes <https://issues.guix.gnu.org/50617>.

* gnu/packages/cmake.scm (%common-build-phases): Turn into a procedure
and adjust users.  When 'target-x86-32?' returns true, add
'skip-cpack-txz-test'.
2021-09-21 10:08:35 +02:00
Ludovic Courtès 68933659cb
base32: Work around (ash x N) miscompilation at '-O1' and below.
Fixes <https://issues.guix.gnu.org/50696>.
Reported by Marius Bakke <marius@gnu.org>.

* guix/base32.scm (bit-field): Introduce 'minus-start' syntax and use it.
2021-09-21 09:45:21 +02:00
Mathieu Othacehe baf8272d23
gnu: icedtea-7: Use pem certificates.
This is a follow-up of: 287a8c9048.

* gnu/packages/java.scm (icedtea-7)[arguments]{install-keystore}: Use pem
certificates.
2021-09-21 07:41:13 +00:00
Mathieu Othacehe 287a8c9048
gnu: nss-certs: Copy pem files.
* gnu/packages/certs.scm (nss-certs)[arguments]<#:phases>{install}: Copy pem
files instead of crt files.
2021-09-21 07:41:07 +00:00
Mathieu Othacehe f87b987248
gnu: certdata2pem: Produce pem files.
Create files with pem extension instead of crt.

* gnu/packages/certs.scm (certdata2pem)[arguments]<#:phases>{fix-extension}:
New phase.
2021-09-21 07:41:07 +00:00
Maxime Devos aacaa222d1
gnu: at-spi2-atk: Don't compile tests when cross-compiling.
* gnu/packages/gtk.scm
  (at-spi2-atk)[arguments]<#:configure-flags>: Set tests=false when
  cross-compiling.
2021-09-20 11:15:10 +00:00
Maxime Devos d1737d44e6
gnu: pango: Add bash-minimal input when cross-compiling.
* gnu/packages/gtk.scm
  (pango)[inputs]: Add "bash-minimal" when cross-compiling.
2021-09-20 11:15:10 +00:00
Maxime Devos 99eff8138b
gnu: gdk-pixbuf: Add bash-minimal input when cross-compiling.
* gnu/packages/gtk.scm
  (gdk-pixbuf)[inputs]: Add "bash-minimal" when cross-compiling.
2021-09-20 11:15:09 +00:00
Maxime Devos 26a336c20b
gnu: gdk-pixbuf: Find docbook when cross-compiling.
* gnu/packages/gtk.scm
  (gdk-pixbuf)[arguments]<#:phases>{patch-docbook}: Look for docbook
  in 'native-inputs' instead of 'inputs' when cross-compiling.
2021-09-20 11:15:09 +00:00
Maxime Devos bce0a7d3d8
gnu: libproxy: Don't run tests when cross-compiling.
* gnu/packages/networking.scm
  (libproxy)[arguments]]<#:phases>{check}: Respect #:tests? when
  cross-compiling.
2021-09-20 11:15:09 +00:00
Maxime Devos be58507d5d
gnu: wayland: Find docbook-xml when cross-compiling.
* gnu/packages/freedesktop.scm
  (wayland)[arguments]<#:phases>{patchdocbook-xml}: Look in 'native-inputs'
  instead of 'inputs' when cross-compiling.
2021-09-20 11:15:09 +00:00
Maxime Devos d979c916e8
gnu: wayland: Find wayland-scanner when cross-compiling.
* gnu/packages/freedesktop.scm (wayland)[native-inputs]: Add
  pkg-config-for-build and 'this-package' when cross-compiling.
2021-09-20 11:15:09 +00:00
Maxime Devos d169b5a84d
gnu: Add pkg-config-for-build.
* gnu/packages/pkg-config.scm (pkg-config-for-build): New variable.
2021-09-20 11:15:09 +00:00
Maxime Devos 175705b971
gnu: libxxf85vm: Add --disable-malloc0-returnsnull when necessary.
* gnu/packages/xorg.scm
  (libxxf86vm)[arguments]<#:configure-flags>: Add malloc0-flags.
2021-09-20 11:15:09 +00:00
Maxime Devos ddd4ceeeb3
gnu: libxrandr: Add --disable-malloc0-returnsnull when necessary.
* gnu/packages/xorg.scm
  (libxrandr)[arguments]<#:configure-flags>: Add malloc0-flags.
2021-09-20 11:15:09 +00:00
Maxime Devos 1485d531a7
gnu: libxi: Add --disable-malloc0-returnsnull when necessary.
* gnu/packages/xorg.scm
  (libxi)[arguments]<#:configure-flags>: Add malloc0-flags.
2021-09-20 11:15:09 +00:00
Maxime Devos 2505055c02
gnu: libxinerama: Add --disable-malloc0-returnsnull when necessary.
* gnu/packages/xorg.scm
  (libxinerama)[arguments]<#:configure-flags>: Add malloc0-flags.
2021-09-20 11:15:08 +00:00
Maxime Devos 76362337b9
gnu: xorg: Unify --disable-malloc0-returnsnull code.
The idea is to keep the comments in one place, instead of copying
them over and over.  It's also documented more now.

* gnu/packages/xorg.scm
  (malloc0-flags): New procedure.
  (libxext,libxrender,libx11,libxt): Use new procedures.
2021-09-20 11:15:08 +00:00
Maxime Devos 4823adb26b
gnu: at-spi2-core: Add missing "bash-minimal" input.
* gnu/packages/gtk.scm
  (at-spi2-core)[inputs]: Add "bash-minimal" when cross-compiling.
2021-09-20 11:15:08 +00:00
Maxime Devos b9ae6181df
gnu: at-spi2-core: Find docbook when cross-compiling.
* gnu/packages/gtk.scm
  (at-spi2-core)[arguments]<#:phases>{patch-docbook-sgml}: Look up
  "docbook-sxml" in 'native-inputs' instead of 'inputs' when cross-compiling.
2021-09-20 11:15:08 +00:00
Maxime Devos b79bf535e4
gnu: at-spi2-core: Don't cross-compile documentation.
* gnu/packages/gtk.scm
  (at-spi2-core)[arguments]<#:configure-flags>: Set docs=false when
  cross-compiling.
  (at-spi2-core)[arguments]<#:phases>{move-documentation}: Remove when
  cross-compiling.
2021-09-20 11:15:08 +00:00
Maxime Devos 0636f02b0e
gnu: avahi: Use the cross-compiled bash.
* gnu/packages/avahi.scm (avahi)[arguments]<#:phases>{patch-more-shebangs}:
  Replace the bash in the shebangs in "/etc/avahi" with a cross-compiled bash.
2021-09-20 11:15:08 +00:00
Maxime Devos 0515ebb0d1
gnu: avahi: Find 'TARGET-pkg-config' when cross-compiling.
The configure script first tests whether "pkg-config" is in PATH,
and then uses "TARGET-pkg-config".  Pretend "pkg-config" exists.

* gnu/packages/avahi.scm (avah)[arguments]<#:configure-flags>: Set
  ac_cv_prog_have_pkg_config=yes when cross-compiling.
2021-09-20 11:15:08 +00:00
Maxime Devos 35e1a572f6
gnu: libdaemon: Support cross-compilation to aarch64-linux-gnu.
* gnu/packages/libdaemon.scm
  (libdaemon)[native-inputs]: Add "config" when cross-compiling for
  aarch64.
  (libdaemon)[arguments]<#:phases>{update-config.sub}: When cross-compiling
  for aarch64, update the "config.sub" script.
2021-09-20 11:15:08 +00:00
Maxime Devos 2b16755f99
gnu: libthai: Add datrie as native-input when cross-compiling.
This allows the cross-build to succeed.

* gnu/packages/gnome.scm
  (libthai)[native-inputs]: Add "datrie" when cross-compiling.
2021-09-20 11:15:08 +00:00
Maxime Devos 1bd0dcf228
gnu: json-glib: Don't build introspection data when cross-compiling.
* gnu/packages/gnome.scm
  (json-glib)[arguments]<#:configure-flags>: Set introspection=false when
  cross-compiling.
2021-09-20 11:15:07 +00:00
Maxime Devos b67ea49e2c
gnu: json-glib: Don't build gtk documentation when cross-compiling.
* gnu/packages/gnome.scm
  (json-glib)[arguments]<#:configue-flags>: Set gtk_doc=disables when
  cross-compiling.
  (json-glib)[arguments]<#:phases>{move-docs}: Don't run when cross-compiling
  ...
  (json-glib)[arguments]<#:phases>{stub-docs}: ... instead, create an empty
  directory where the documentation would be.
2021-09-20 11:15:07 +00:00
Maxime Devos d0cf033661
gnu: json-glib: Find docbook inputs when cross-compiling.
* gnu/packages/gnome.scm (json-glib)[arguments]<#:phases>{patch-docbook}:
  Look up "docbook-xml" in 'native-inputs', not 'inputs', when
  cross-compiling.
2021-09-20 11:15:07 +00:00
Maxime Devos bb4293469b
gnu: json-glib: Add missing 'bash-minimal' input.
* gnu/packages/gnome.scm (json-glib)[inputs]: Add "bash-minimal" when
  cross-compiling (for wrapper scripts).
2021-09-20 11:15:07 +00:00
Maxime Devos 8bf0c60086
gnu: heimdal: Use libcom_err from input when cross-compiling.
* gnu/packages/kerberos.scm
  (heimdal)[arguments]<#:phases>{pre-configure}: Consider ${krb_cv_com_err}
  to be 'yes' when cross-compiling.
2021-09-20 11:15:07 +00:00
Maxime Devos 784865adfe
gnu: heimdal: Find tools when cross-compiling.
* gnu/packages/kerberos.scm
  (heimdal)[arguments]<#:configure-flags>: Set --with-cross-tools.
  (heimdal)[arguments]<#:phases>{pre-configure}: Override
  ac_cv_PROG_COMPILE_ET.
2021-09-20 11:15:07 +00:00
Maxime Devos 0bff68e44d
gnu: heimdal: Use the cross-compiled bash in "su".
* gnu/packages/kerberos.scm
  (heimdal)[arguments]<#:phases>{pre-configure}: Replace _PATH_BSHELL
  with the cross-compiled bin/sh when cross-compiling.
2021-09-20 11:15:07 +00:00
Maxime Devos 527455be35
gnu: heimdal: Refer to cross-compiled bash.
* gnu/packages/kerberos.scm
  (heimdal)[arguments]<#:phases>{pre-configure}: Let "appl/afsutil/pagsh.c"
  refer to the cross-compiled bash instead of the native bash when
  cross-compiling.
2021-09-20 11:15:07 +00:00
Maxime Devos f706689a8d
gnu: heimdal: Fix linking error when cross-compiling.
* gnu/packages/kerberos.scm (heimdal)[arguments]<#:configure-flags>:
  Set ac_cv_func_getpwnam_r_posix=yes when cross-compiling.
2021-09-20 11:15:06 +00:00
Maxime Devos de8ea8e827
gnu: heimdal: Fix inputs when cross-compiling.
* gnu/packages/kerberos.scm
  (heimdal)[inputs]: Add "bash-minimal" when cross-compiling.
  (heimdal)[native-inputs]: Add 'perl' when cross-compiling.
2021-09-20 11:15:06 +00:00
Maxime Devos c170e9b75f
gnu: iso-codes: Move inputs to native-inputs when cross-compiling.
* gnu/packages/iso-codes.scm
  (iso-codes)[inputs]: Move "gettext", "perl" and "python" to ...
  (iso-codes)[native-inputs]: ... here when cross-compiling.
2021-09-20 11:15:06 +00:00
Maxime Devos 3a8d342cdf
gnu: gamin: Fix 'configure' script when cross-compiling.
* gnu/packages/gnome.scm
  (gamin)[arguments]<#:phases>{set-have-abstract-sockets}: Override
  test for ‘abstract sockets’ when cross-compiling.
2021-09-20 11:15:06 +00:00
Maxime Devos c3a3a4a761
gnu: gamin: Recognise aarch64 as architecture when cross-compiling.
* gnu/packages/gnome.scm
  (gamin)[arguments]<#:phases>{replace-config.sub}: Update 'config.sub'
  when cross-compiling.
  (gamin)[native-inputs]: Add "config" when cross-compiling.
2021-09-20 11:15:06 +00:00