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/wv.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/wv.scm')
| -rw-r--r-- | gnu/packages/wv.scm | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gnu/packages/wv.scm b/gnu/packages/wv.scm index a8c0d3cbaf..1fdcf0ac2b 100644 --- a/gnu/packages/wv.scm +++ b/gnu/packages/wv.scm @@ -43,14 +43,9 @@ (base32 "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc")))) (build-system gnu-build-system) (inputs - `(("glib" ,glib) - ("libgsf" ,libgsf) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("zlib" ,zlib))) + (list glib libgsf libjpeg-turbo libpng zlib)) (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) + (list `(,glib "bin") pkg-config)) (synopsis "Microsoft Word conversion library and utilities") (description "wv converts files written by Word 2000, 97, 95, and 6 (known internally as |