diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/smalltalk.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
| download | guix-1a5302435ff0d2822b823f5a6fe01faa7a85c629.tar.gz | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in: gnu/local.mk gnu/packages/databases.scm gnu/packages/glib.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/gnuzilla.scm gnu/packages/graphics.scm gnu/packages/gstreamer.scm gnu/packages/gtk.scm gnu/packages/linux.scm gnu/packages/machine-learning.scm gnu/packages/networking.scm gnu/packages/polkit.scm gnu/packages/pulseaudio.scm gnu/packages/rpc.scm gnu/packages/rust.scm gnu/packages/version-control.scm gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/smalltalk.scm')
| -rw-r--r-- | gnu/packages/smalltalk.scm | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/gnu/packages/smalltalk.scm b/gnu/packages/smalltalk.scm index 26f7ab2c76..c89e95316a 100644 --- a/gnu/packages/smalltalk.scm +++ b/gnu/packages/smalltalk.scm @@ -61,12 +61,12 @@ (patches (search-patches "smalltalk-multiplication-overflow.patch")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ;; XXX: To be removed with the next release of Smalltalk. - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("zip" ,zip))) + (list pkg-config + ;; XXX: To be removed with the next release of Smalltalk. + autoconf + automake + libtool + zip)) ;; TODO: These optional dependencies raise the closure size to ~1 GiB ;; from the current ~100 MiB, although some of them might be very ;; useful for end users: @@ -79,11 +79,7 @@ ;; - sqlite ;; - zlib (inputs - `(("gmp" ,gmp) - ("libffi" ,libffi) - ("libltdl" ,libltdl) - ("libsigsegv" ,libsigsegv) - ("lightning" ,lightning))) + (list gmp libffi libltdl libsigsegv lightning)) (arguments `(#:phases (modify-phases %standard-phases @@ -146,15 +142,15 @@ such as ones for networking and GUI programming.") "(VM_BUILD_STRING \\\"Built with GNU Guix\\\")")) #t)))) (inputs - `(("alsa-lib" ,alsa-lib) - ("dbus" ,dbus) - ("freetype" ,freetype) - ("libffi" ,libffi) - ("libxrender" ,libxrender) - ("mesa" ,mesa) - ("pulseaudio" ,pulseaudio))) + (list alsa-lib + dbus + freetype + libffi + libxrender + mesa + pulseaudio)) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (build-system cmake-build-system) (arguments `(#:tests? #f ;no check target |