aboutsummaryrefslogtreecommitdiff
path: root/gnu/image.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-05-19 10:36:31 +0200
committerMarius Bakke <marius@gnu.org>2020-05-26 22:32:56 +0200
commit2d2713596205129403b3864d33b1af6763d450cf (patch)
treea9ac526a2154373ea4ceafd5181d7da03783ea95 /gnu/image.scm
parent8d1ab36a56b4fda3f89c81816cb25729ba95176d (diff)
downloadguix-2d2713596205129403b3864d33b1af6763d450cf.tar.gz
guix-2d2713596205129403b3864d33b1af6763d450cf.zip
gnu: Mesa: Fix ineffective substitution on i686-linux.
This is a follow-up to commit ee345ae62c8b899186b65b61a2376b5adb938520. * gnu/packages/gl.scm (mesa)[arguments]: Adjust substitution to use the correct file name.
Diffstat (limited to 'gnu/image.scm')
0 files changed, 0 insertions, 0 deletions
m.scm: Likewise. (guile-sqlite3&co): Rename to... (gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT. (expression->derivation-in-linux-vm)[config]: Remove. (iso9660-image)[config]: Remove. (qemu-image)[config]: Remove. (system-docker-image)[config]: Remove. * guix/scripts/pack.scm: Adjust imports. (guile-sqlite3&co): Rename to... (gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT. (self-contained-tarball)[build]: Call 'make-config.scm' without #:libgcrypt argument. (squashfs-image)[libgcrypt]: Remove. [build]: Call 'make-config.scm' without #:libgcrypt. (docker-image)[config, json]: Remove. [build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from the imported modules. * guix/self.scm (specification->package): Remove "libgcrypt", add "guile-gcrypt". (compiled-guix): Remove #:libgcrypt. [guile-gcrypt]: New variable. [dependencies]: Add it. [*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call. Add #:extensions. [*config*]: Remove #:libgcrypt from 'make-config.scm' call. (%dependency-variables): Remove %libgcrypt. (make-config.scm): Remove #:libgcrypt. * build-aux/build-self.scm (guile-gcrypt): New variable. (make-config.scm): Remove #:libgcrypt. (build-program)[fake-gcrypt-hash]: New variable. Add (gcrypt hash) to the imported modules. Adjust load path assignments. * gnu/packages/package-management.scm (guix)[propagated-inputs]: Add GUILE-GCRYPT. [arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search path. Ludovic Courtès 2018-07-10guix: Add opam importer....* guix/scripts/import.scm (importers): Add opam. * guix/scripts/import/opam.scm: New file. * guix/import/opam.scm: New file. * tests/opam.scm: New file. * Makefile.am: Add them. * doc/guix.texi (Invoking guix import): Document it. Julien Lepiller