gnu: Add and use gettext-minimal.

* gnu/packages/gettext.scm (gnu-gettext): Rename to... (gettext-minimal): ... this. Adjust synopsis and description. (gnu-gettext): Inherit from it. (po4a): Use 'gettext-minimal' instead of 'gnu-gettext'. * gnu/packages/acl.scm: Likewise. * gnu/packages/admin.scm: Likewise. * gnu/packages/apl.scm: Likewise. * gnu/packages/attr.scm: Likewise. * gnu/packages/audio.scm: Likewise. * gnu/packages/base.scm: Likewise. * gnu/packages/cdrom.scm: Likewise. * gnu/packages/commencement.scm: Likewise. * gnu/packages/crypto.scm: Likewise. * gnu/packages/databases.scm: Likewise. * gnu/packages/disk.scm: Likewise. * gnu/packages/documentation.scm: Likewise. * gnu/packages/education.scm: Likewise. * gnu/packages/engineering.scm: Likewise. * gnu/packages/enlightenment.scm: Likewise. * gnu/packages/fcitx.scm: Likewise. * gnu/packages/fontutils.scm: Likewise. * gnu/packages/freedesktop.scm: Likewise. * gnu/packages/games.scm: Likewise. * gnu/packages/gkrellm.scm: Likewise. * gnu/packages/glib.scm: Likewise. * gnu/packages/gnome.scm: Likewise. * gnu/packages/grub.scm: Likewise. * gnu/packages/gtk.scm: Likewise. * gnu/packages/guile.scm: Likewise. * gnu/packages/ibus.scm: Likewise. * gnu/packages/irc.scm: Likewise. * gnu/packages/iso-codes.scm: Likewise. * gnu/packages/kde-frameworks.scm: Likewise. * gnu/packages/kodi.scm: Likewise. * gnu/packages/linux.scm: Likewise. * gnu/packages/man.scm: Likewise. * gnu/packages/maths.scm: Likewise. * gnu/packages/mono.scm: Likewise. * gnu/packages/mp3.scm: Likewise. * gnu/packages/music.scm: Likewise. * gnu/packages/nano.scm: Likewise. * gnu/packages/networking.scm: Likewise. * gnu/packages/package-management.scm: Likewise. * gnu/packages/pdf.scm: Likewise. * gnu/packages/sawfish.scm: Likewise. * gnu/packages/statistics.scm: Likewise. * gnu/packages/terminals.scm: Likewise. * gnu/packages/version-control.scm: Likewise. * gnu/packages/vpn.scm: Likewise. * gnu/packages/w3m.scm: Likewise. * gnu/packages/webkit.scm: Likewise. * gnu/packages/wicd.scm: Likewise. * gnu/packages/wine.scm: Likewise. * gnu/packages/xdisorg.scm: Likewise. * gnu/packages/xorg.scm: Likewise.
2016-09-25 10:33:02 +03:00 · 2016-09-25 10:33:02 +03:00 · b94a6ca074
parent 217f3fdfe6
commit b94a6ca074
52 changed files with 99 additions and 93 deletions
--- a/gnu/packages/acl.scm
+++ b/gnu/packages/acl.scm
@ -59,7 +59,7 @@
          %standard-phases))))
    (inputs `(("attr" ,attr)))
    (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("perl" ,perl)))
    (home-page "http://savannah.nongnu.org/projects/acl")
    (synopsis
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@ -176,7 +176,7 @@ interface and is based on GNU Guile.")
        "0zk1ppx93ijimf4sbgqilxxikpsa2gmpbynknyh41xy7jbdjxp0b"))))
   (build-system cmake-build-system)
   (arguments '(#:tests? #f)) ; There are no tests.
-   (native-inputs `(("gettext" ,gnu-gettext)))
+   (native-inputs `(("gettext" ,gettext-minimal)))
   (home-page "http://projects.gw-computing.net/projects/dfc")
   (synopsis "Display file system space usage using graphs and colors")
   (description
@ -1729,7 +1729,7 @@ highly portable.  Great for heterogenous networks.")
         (delete 'configure)))) ; no configure script
    (inputs
     `(("gtk+" ,gtk+)
-       ("gnu-gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("libnotify" ,libnotify)))
    (native-inputs
     `(("pkg-config" ,pkg-config)))
--- a/gnu/packages/apl.scm
+++ b/gnu/packages/apl.scm
@ -41,7 +41,7 @@
    (build-system gnu-build-system)
    (home-page "http://www.gnu.org/software/apl/")
    (inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("lapack" ,lapack)
       ("sqlite" ,sqlite)
       ("readline" ,readline)))
--- a/gnu/packages/attr.scm
+++ b/gnu/packages/attr.scm
@ -69,7 +69,7 @@
         '()
         `(("perl" ,perl))))
    (native-inputs
-     `(("gettext" ,gnu-gettext)))
+     `(("gettext" ,gettext-minimal)))
    (home-page "http://savannah.nongnu.org/projects/attr/")
    (synopsis "Library and tools for manipulating extended attributes")
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@ -358,7 +358,7 @@ tools (analyzer, mono/stereo tools, crossovers).")
       ("liblo" ,liblo)
       ("ladspa" ,ladspa)
       ("jack" ,jack-1)
-       ("gettext" ,gnu-gettext)))
+       ("gettext" ,gettext-minimal)))
    (native-inputs
     `(("bison" ,bison)
       ("flex" ,flex)
@ -909,7 +909,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
     `(("gperf" ,gperf)
       ("faust" ,faust)
       ("intltool" ,intltool)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("pkg-config" ,pkg-config)))
    (native-search-paths
     (list (search-path-specification
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@ -642,7 +642,7 @@ store.")
   ;; install the message catalogs, with 'msgfmt'.
   (native-inputs `(("texinfo" ,texinfo)
                    ("perl" ,perl)
-                    ("gettext" ,gnu-gettext)))
+                    ("gettext" ,gettext-minimal)))
   (native-search-paths
    ;; Search path for packages that provide locale data.  This is useful
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@ -205,7 +205,7 @@ reconstruction capability.")
    (inputs
     `(("gtk+" ,gtk+-2)))
    (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("pkg-config" ,pkg-config)
       ("which" ,which)))
    (arguments
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@ -576,13 +576,13 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
 (define gettext-boot0
  ;; A minimal gettext used during bootstrap.
  (let ((gettext-minimal
-         (package (inherit gnu-gettext)
+         (package (inherit gettext-minimal)
           (name "gettext-boot0")
           (inputs '())                           ;zero dependencies
           (arguments
            (substitute-keyword-arguments
                `(#:tests? #f
-                  ,@(package-arguments gnu-gettext))
+                  ,@(package-arguments gettext-minimal))
              ((#:phases phases)
               `(modify-phases ,phases
                  ;; Build only the tools.
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@ -204,7 +204,7 @@ communication.")
    (native-inputs
     `(("autoconf" ,autoconf)
       ("automake" ,automake)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("libtool" ,libtool)
       ("perl" ,perl)
       ("pkg-config" ,pkg-config)))
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@ -86,7 +86,7 @@
       ("python" ,python-2)
       ("autoconf" ,autoconf)
       ("automake" ,automake)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("libtool" ,libtool)
       ("pcre" ,pcre "bin")                       ;for 'pcre-config'
       ("pkg-config" ,pkg-config)))
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@ -72,7 +72,7 @@
       ("readline" ,readline)
       ("util-linux" ,util-linux)))
    (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ;; For the tests.
       ("perl" ,perl)
       ("python" ,python-2)))
@ -97,7 +97,7 @@ tables.  It includes a library and command-line utility.")
        "04nd7civ561x2lwcmxhsqbprml3178jfc58fy1v7hzqg5k4nbhy3"))))
    (build-system gnu-build-system)
    (inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("guile" ,guile-1.8)
       ("util-linux" ,util-linux)
       ("parted" ,parted)))
@ -123,7 +123,7 @@ tables, and it understands a variety of different formats.")
        "1izazbyv5n2d81qdym77i8mg9m870hiydmq4d0s51npx5vp8lk46"))))
    (build-system gnu-build-system)
    (inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("ncurses" ,ncurses)
       ("popt" ,popt)
       ("util-linux" ,util-linux))) ; libuuid
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@ -126,7 +126,7 @@ and to some extent D.")
    (build-system gnu-build-system)
    (native-inputs
     `(("flex" ,flex)
-       ("gettext" ,gnu-gettext)))
+       ("gettext" ,gettext-minimal)))
    (home-page "http://docpp.sourceforge.net/")
    (synopsis "Documentation system for C, C++, IDL, and Java")
    (description
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@ -59,7 +59,7 @@
        ("zlib" ,zlib)
        ("qtserialport" ,qtserialport)
        ("qtscript" ,qtscript)
-        ("gettext" ,gnu-gettext)))
+        ("gettext" ,gettext-minimal)))
    (native-inputs
      `(("qtbase" ,qtbase)                   ;Qt MOC is needed at compile time
        ("qttools" ,qttools)
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@ -443,7 +443,7 @@ ready for production.")
     `(("autoconf" ,autoconf)
       ("automake" ,automake)
       ("libtool" ,libtool)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("po4a" ,po4a)
       ("pkg-config" ,pkg-config)))
    (inputs
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@ -300,7 +300,7 @@ Libraries with some extra bells and whistles.")
    (arguments
     `(#:configure-flags '("--enable-mount-eeze")))
    (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("pkg-config" ,pkg-config)))
    (inputs
     `(("alsa-lib" ,alsa-lib)
--- a/gnu/packages/fcitx.scm
+++ b/gnu/packages/fcitx.scm
@ -70,7 +70,7 @@
    (inputs
     `(("dbus"             ,dbus)
       ("enchant"          ,enchant)
-       ("gettext"          ,gnu-gettext)
+       ("gettext"          ,gettext-minimal)
       ("gtk2"             ,gtk+-2)
       ("gtk3"             ,gtk+)
       ("icu4c"            ,icu4c)
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@ -523,7 +523,7 @@ definitions.")
   (inputs `(("cairo"           ,cairo)
             ("fontconfig"      ,fontconfig) ;dlopen'd
             ("freetype"        ,freetype)
-             ("gettext"         ,gnu-gettext)
+             ("gettext"         ,gettext-minimal)
             ("glib"            ,glib) ;needed for pango detection
             ("libICE"          ,libice)
             ("libSM"           ,libsm)
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@ -189,7 +189,7 @@ the freedesktop.org XDG Base Directory specification.")
                                        "/libexec/elogind/elogind\n"))))))))
    (native-inputs
     `(("intltool" ,intltool)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("docbook-xsl" ,docbook-xsl)
       ("docbook-xml" ,docbook-xml)
       ("xsltproc" ,libxslt)
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@ -158,7 +158,7 @@ representation of the playing board.")
              ("libx11" ,libx11)
              ("guile" ,guile-2.0)
              ("gtkglext" ,gtkglext)))
-    (native-inputs `(("gettext" ,gnu-gettext)
+    (native-inputs `(("gettext" ,gettext-minimal)
                     ("pkg-config" ,pkg-config)))
    (home-page "https://www.gnu.org/software/gnubik/")
    (synopsis "3d Rubik's cube game")
@ -354,7 +354,7 @@ interface or via an external visual interface such as GNU XBoard.")
                "08c51imfjfcydm7h0va09z8qfw5nc837bi2x754ni2z737hb5kw2"))))
    (build-system gnu-build-system)
    (arguments `(#:configure-flags '("--disable-embedded-resources")))
-    (native-inputs `(("gettext" ,gnu-gettext)
+    (native-inputs `(("gettext" ,gettext-minimal)
                     ("pkg-config" ,pkg-config)))
    (inputs `(("sdl" ,sdl)
              ("sdl-image" ,sdl-image)
@ -730,7 +730,7 @@ match, cannon keep, and grave-itation pit.")
       ("freetype" ,(@ (gnu packages fontutils) freetype))
       ("curl" ,curl)
       ("luajit" ,luajit)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("sqlite" ,sqlite)))
    (propagated-inputs
     `(("minetest-data" ,minetest-data)))
@ -1050,7 +1050,7 @@ falling, themeable graphics and sounds, and replays.")
       ;;   cc1plus: all warnings being treated as errors
       '("-DENABLE_STRICT_COMPILATION=OFF")))
    (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("pkg-config" ,pkg-config)))
    (inputs
     `(("boost" ,boost)
@ -2572,7 +2572,7 @@ safety of the Chromium vessel.")
    (inputs
     `(("cairo" ,cairo)
       ("fribidi" ,fribidi)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("libpng" ,libpng)
       ("librsvg" ,librsvg)
       ("libpaper" ,libpaper)
@ -2668,7 +2668,7 @@ with the \"Stamp\" tool within Tux Paint.")
         "1z12s46mvy87qs3vgq9m0ki9pp21zqc52mmgphahpihw3s7haf6v"))))
    (build-system gnu-build-system)
    (native-inputs
-     `(("gettext" ,gnu-gettext)))
+     `(("gettext" ,gettext-minimal)))
    (inputs
     `(("fltk" ,fltk)
       ("libpaper" ,libpaper)
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@ -31,16 +31,9 @@
  #:use-module (gnu packages tex)
  #:use-module (gnu packages xml))
-;; Use that name to avoid clashes with Guile's 'gettext' procedure.
+(define-public gettext-minimal
 ;;
 ;; We used to resort to #:renamer on the user side, but that prevented
 ;; circular dependencies involving (gnu packages gettext).  This is because
 ;; 'resolve-interface' (as of Guile 2.0.9) iterates eagerly over the used
 ;; module when there's a #:renamer, and that module may be empty at that point
 ;; in case or circular dependencies.
 (define-public gnu-gettext
  (package
-    (name "gettext")
+    (name "gettext-minimal")
    (version "0.19.8.1")
    (source (origin
             (method url-fetch)
@ -90,15 +83,28 @@
       ;; When tests fail, we want to know the details.
       #:make-flags '("VERBOSE=yes")))
    (home-page "http://www.gnu.org/software/gettext/")
-    (synopsis "Tools and documentation for translation")
+    (synopsis
     "Tools and documentation for translation (used to build other packages)")
    (description
     "GNU Gettext is a package providing a framework for translating the
 textual output of programs into multiple languages.  It provides translators
-with the means to create message catalogs, as well as an Emacs mode to work
+with the means to create message catalogs, and a runtime library to load
-with them, and a runtime library to load translated messages from the
+translated messages from the catalogs.  Nearly all GNU packages use Gettext.")
 catalogs.  Nearly all GNU packages use Gettext.")
    (license gpl3+)))                             ;some files are under GPLv2+
 ;; Use that name to avoid clashes with Guile's 'gettext' procedure.
 ;;
 ;; We used to resort to #:renamer on the user side, but that prevented
 ;; circular dependencies involving (gnu packages gettext).  This is because
 ;; 'resolve-interface' (as of Guile 2.0.9) iterates eagerly over the used
 ;; module when there's a #:renamer, and that module may be empty at that point
 ;; in case or circular dependencies.
 (define-public gnu-gettext
  (package
    (inherit gettext-minimal)
    (name "gettext")
    (synopsis "Tools and documentation for translation")))
 (define-public po4a
  (package
    (name "po4a")
@ -140,7 +146,7 @@ catalogs.  Nearly all GNU packages use Gettext.")
                        (find-files bin "\\.*$"))
              #t))))))
    (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("perl-module-build" ,perl-module-build)
       ("docbook-xsl" ,docbook-xsl)
       ("docbook-xml" ,docbook-xml) ;for tests
--- a/gnu/packages/gkrellm.scm
+++ b/gnu/packages/gkrellm.scm
@ -41,7 +41,7 @@
        "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh"))))
    (build-system gnu-build-system)
    (inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("gtk+" ,gtk+-2)
       ("libice" ,libice)
       ("libsm" ,libsm)))
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@ -153,7 +153,7 @@ shared NFS home directories.")
      ("zlib" ,zlib)
      ("tzdata" ,tzdata)))     ; for tests/gdatetime.c
   (native-inputs
-    `(("gettext" ,gnu-gettext)
+    `(("gettext" ,gettext-minimal)
      ("dbus" ,dbus)                              ; for GDBus tests
      ("pkg-config" ,pkg-config)
      ("python" ,python-wrapper)
@ -343,7 +343,7 @@ bindings to call into the C library.")
    (propagated-inputs
     `(;; Propagate gettext because users expect it to be there, and so does
       ;; the `intltool-update' script.
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("perl-xml-parser" ,perl-xml-parser)
       ("perl" ,perl)))
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@ -3568,7 +3568,7 @@ USB transfers with your high-level application or system daemon.")
       ("gusb" ,gusb)
       ("libsane" ,sane-backends)))
    (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("itstool" ,itstool)
       ("colord" ,colord)
       ("glib" ,glib "bin")                       ; glib-compile-schemas, etc.
@ -3879,7 +3879,7 @@ metadata in photo and video files of various formats.")
    (native-inputs
     `(("pkg-config" ,pkg-config)
       ("itstool" ,itstool)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("itstool" ,itstool)
       ("vala" ,vala)))
    (inputs
@ -4153,7 +4153,7 @@ powerful general purpose text editor.")
                "0j2sy6imwp41l75hy3fwr68n35drvanbwgmr42kc04zqjy9pbs02"))))
    (build-system gnu-build-system)
    (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("itstool" ,itstool)
       ("pkg-config" ,pkg-config)))
    (inputs
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@ -112,7 +112,7 @@
                     #t)))))
    (inputs
     `(;; ("lvm2" ,lvm2)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("freetype" ,freetype)
       ;; ("libusb" ,libusb)
       ;; ("fuse" ,fuse)
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@ -580,7 +580,7 @@ is part of the GNOME accessibility project.")
      ("libxrandr" ,libxrandr)))
   (native-inputs
    `(("perl" ,perl)
-      ("gettext" ,gnu-gettext)
+      ("gettext" ,gettext-minimal)
      ("glib" ,glib "bin")
      ("gobject-introspection" ,gobject-introspection)
      ("pkg-config" ,pkg-config)
@ -648,7 +648,7 @@ application suites.")
   (native-inputs
    `(("perl" ,perl)
      ("glib" ,glib "bin")
-      ("gettext" ,gnu-gettext)
+      ("gettext" ,gettext-minimal)
      ("pkg-config" ,pkg-config)
      ("gobject-introspection" ,gobject-introspection)
      ("python-wrapper" ,python-wrapper)
@ -1165,7 +1165,7 @@ write GNOME applications.")
               (base32
                "03wsxj27hvcbs3x96nah7j3paclifwlfag8kdph4kldl48srp9pb"))))
    (native-inputs `(("pkg-config" ,pkg-config)
-                     ("gettext" ,gnu-gettext)))
+                     ("gettext" ,gettext-minimal)))
    (inputs `(("gtk+" ,gtk+)
              ("check" ,check)))
    (arguments
@ -1229,7 +1229,7 @@ information.")
     `(("pkg-config" ,pkg-config)
       ("itstool" ,itstool)
       ("libxml" ,libxml2)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("bc" ,bc)))
    (inputs
     `(("perl" ,perl)
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@ -261,7 +261,7 @@ without requiring the source code to be rewritten.")
       ("libtool" ,libtool)
       ("flex" ,flex)
       ("texinfo" ,texinfo)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ,@(package-native-inputs guile-next)))
    ;; Same as in guile-2.0
    (native-search-paths
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@ -265,7 +265,7 @@ Chinese pinyin input methods.")
                '("ibus-engine-anthy" "ibus-setup-anthy"))
               #t))))))
    (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("intltool" ,intltool)
       ("pkg-config" ,pkg-config)
       ("python" ,python)))
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@ -155,7 +155,7 @@ SILC and ICB protocols via plugins.")
                     ("libtool" ,libtool)))
    (inputs `(("ncurses" ,ncurses)
              ("diffutils" ,diffutils)
-              ("gettext" ,gnu-gettext)
+              ("gettext" ,gettext-minimal)
              ("libltdl" ,libltdl)
              ("libgcrypt" ,libgcrypt "out")
              ("zlib" ,zlib)
--- a/gnu/packages/iso-codes.scm
+++ b/gnu/packages/iso-codes.scm
@ -40,7 +40,7 @@
               "037hmfs5pk3g36psm378vap1mbrkk86vv8wsdnv65mzbnph52gv0"))))
    (build-system gnu-build-system)
    (inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("perl" ,perl)
       ("python" ,python-wrapper)))
    (home-page "https://pkg-isocodes.alioth.debian.org/")
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@ -601,7 +601,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.")
          "0cw24spmwsqa3ppkw03cm6yjd3sfll0dbbk2ya76fd4nw9hb00dv"))))
    (build-system cmake-build-system)
    (propagated-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("python" ,python)))
    (native-inputs
     `(("extra-cmake-modules" ,extra-cmake-modules)))
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@ -199,7 +199,7 @@ generator library for C++.")
       ("cmake" ,cmake)
       ("doxygen" ,doxygen)
       ("gawk" ,gawk)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("icedtea" ,icedtea) ; needed at build-time only, mandatory
       ("libtool" ,libtool)
       ("pkg-config" ,pkg-config)
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@ -919,7 +919,7 @@ MIDI functionality to the Linux-based operating system.")
       ("ncurses" ,ncurses)
       ("alsa-lib" ,alsa-lib)
       ("xmlto" ,xmlto)
-       ("gettext" ,gnu-gettext)))
+       ("gettext" ,gettext-minimal)))
    (home-page "http://www.alsa-project.org/")
    (synopsis "Utilities for the Advanced Linux Sound Architecture (ALSA)")
    (description
@ -1108,7 +1108,7 @@ manpages.")
                         (sha256
                          (base32
                           "0p93lsqx23v5fv4hpbrydmfvw1ha2rgqpn2zqbs2jhxkzhjc030p"))))))
-    (native-inputs `(("gettext" ,gnu-gettext)))
+    (native-inputs `(("gettext" ,gettext-minimal)))
    (synopsis "Tools for controlling the network subsystem in Linux")
    (description
@ -2528,7 +2528,7 @@ Bluetooth audio output devices like headphones or loudspeakers.")
               #t))))))
    (native-inputs
     `(("pkg-config" ,pkg-config)
-       ("gettext" ,gnu-gettext)))
+       ("gettext" ,gettext-minimal)))
    (inputs
     `(("glib" ,glib)
       ("dbus" ,dbus)
@ -2868,7 +2868,7 @@ from that to the system kernel's @file{/dev/random} machinery.")
                            "DEBUG=false"
                            "PACKAGE_BUGREPORT=bug-guix@gnu.org"))
       #:tests? #f)) ;no tests
-    (native-inputs `(("gettext" ,gnu-gettext)))
+    (native-inputs `(("gettext" ,gettext-minimal)))
    (inputs `(("pciutils" ,pciutils)))
    (home-page (package-home-page linux-libre))
    (synopsis "CPU frequency and voltage scaling tools for Linux")
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@ -184,7 +184,7 @@ Linux kernel and C library interfaces employed by user-space programs.")
     `(("perl" ,perl)
       ;; TODO: Add these optional dependencies.
       ;; ("perl-LocaleGettext" ,perl-LocaleGettext)
-       ;; ("gettext" ,gnu-gettext)
+       ;; ("gettext" ,gettext-minimal)
       ))
    (home-page "http://www.gnu.org/software/help2man/")
    (synopsis "Automatically generate man pages from program --help")
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@ -2405,7 +2405,7 @@ evaluates expressions using the standard order of operations.")
               (base32
                "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq"))))
    (build-system gnu-build-system)
-    (native-inputs `(("gettext" ,gnu-gettext)))
+    (native-inputs `(("gettext" ,gettext-minimal)))
    (inputs `(("libx11" ,libx11)
              ("zlib" ,zlib)
              ("libpng" ,libpng)
--- a/gnu/packages/mono.scm
+++ b/gnu/packages/mono.scm
@ -44,7 +44,7 @@
                "0jibyvyv2jy8dq5ij0j00iq3v74r0y90dcjc3dkspcfbnn37cphn"))))
    (build-system gnu-build-system)
    (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("glib" ,glib)
       ("libxslt" ,libxslt)
       ("perl" ,perl)
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@ -443,7 +443,7 @@ format.")
               (install-file "mpc123" bin)))))
       #:tests? #f))
    (native-inputs
-     `(("gettext" ,gnu-gettext)))
+     `(("gettext" ,gettext-minimal)))
    (inputs
     `(("libao" ,ao)
       ("libmpcdec" ,libmpcdec)))
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@ -344,7 +344,7 @@ for path in [path for path in sys.path if 'site-packages' in path]: site.addsite
       ("python2-pyliblo" ,python2-pyliblo)
       ("python2-pygtk" ,python2-pygtk)))
    (native-inputs
-     `(("gettext" ,gnu-gettext)))
+     `(("gettext" ,gettext-minimal)))
    (home-page "http://das.nasophon.de/gtklick/")
    (synopsis "Simple metronome with an easy-to-use graphical interface")
    (description
@ -415,7 +415,7 @@ interface.  It is implemented as a frontend to @code{klick}.")
       ("flex" ,flex)
       ("fontforge" ,fontforge)
       ("dblatex" ,dblatex)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("imagemagick" ,imagemagick)
       ("netpbm" ,netpbm) ;for pngtopnm
       ("texlive" ,texlive) ;metafont and metapost
@ -563,7 +563,7 @@ for path in [path for path in sys.path if 'site-packages' in path]: site.addsite
    (inputs
     `(("python" ,python-2)
       ("pygtk" ,python2-pygtk)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("gtk" ,gtk+)
       ("lilypond" ,lilypond)
       ;; players needed at runtime
@ -838,7 +838,7 @@ Laurens Hammond and Don Leslie.")
       ("flac" ,flac)
       ("alsa-lib" ,alsa-lib)
       ("libvorbis" ,libvorbis)
-       ("gettext" ,gnu-gettext)))
+       ("gettext" ,gettext-minimal)))
    (native-inputs
     `(("pkg-config" ,pkg-config)
       ("glib:bin" ,glib "bin")
@ -1031,7 +1031,7 @@ export.")
     `(("autoconf" ,autoconf)
       ("automake" ,automake)
       ("libtool" ,libtool)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("pkg-config" ,pkg-config)))
    (inputs
     `(("tk" ,tk)
--- a/gnu/packages/nano.scm
+++ b/gnu/packages/nano.scm
@ -39,7 +39,7 @@
        "1vhjrcydcfxqq1719vcsvqqnbjbq2523m00dhzag5vwzkc961c5j"))))
    (build-system gnu-build-system)
    (inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("ncurses" ,ncurses)))
    (home-page "http://www.nano-editor.org/")
    (synopsis "Small, user-friendly console text editor")
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@ -400,7 +400,7 @@ network frames.")
         "1110r3gpsj9xmybdw7w4zkhj3zmn5mnv2nq0ijbvrywbn019zdfs"))))
    (build-system gnu-build-system)
    (native-inputs
-     `(("gettext" ,gnu-gettext)))
+     `(("gettext" ,gettext-minimal)))
    (inputs
     `(("fftw" ,fftw)
       ("ncurses" ,ncurses)
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@ -247,7 +247,7 @@ the Nix package manager.")
      (native-inputs
       `(("autoconf" ,(autoconf-wrapper))
         ("automake" ,automake)
-         ("gettext" ,gnu-gettext)
+         ("gettext" ,gettext-minimal)
         ("texinfo" ,texinfo)
         ("graphviz" ,graphviz)
         ("help2man" ,help2man)
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@ -396,7 +396,7 @@ by using the poppler rendering engine.")
              (patches (search-patches
                        "zathura-plugindir-environment-variable.patch"))))
    (native-inputs `(("pkg-config" ,pkg-config)
-                     ("gettext" ,gnu-gettext)))
+                     ("gettext" ,gettext-minimal)))
    (inputs `(("girara" ,girara)
              ("sqlite" ,sqlite)
              ("gtk+" ,gtk+)))
--- a/gnu/packages/sawfish.scm
+++ b/gnu/packages/sawfish.scm
@ -152,7 +152,7 @@ backend of Sawfish.")
                           "/lib/sawfish/sawfish-menu")))
         %standard-phases))))
    (native-inputs
-     `(("gettext"     ,gnu-gettext)
+     `(("gettext"     ,gettext-minimal)
       ("makeinfo"    ,texinfo)
       ("pkg-config"  ,pkg-config)
       ("which"       ,which)))
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@ -74,7 +74,7 @@
    (build-system gnu-build-system)
    (inputs
     `(("cairo" ,cairo)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("gsl" ,gsl)
       ("libxml2" ,libxml2)
       ("pango" ,pango)
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@ -65,7 +65,7 @@
    (native-inputs
     `(("autoconf" ,autoconf)
       ("automake" ,automake)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("pkg-config" ,pkg-config)))
    (inputs
     `(("glib" ,glib "bin")
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@ -88,7 +88,7 @@
    (inputs
     ;; Note: 'tools/packaging/lp-upload-release' and 'tools/weavemerge.sh'
     ;; require Zsh.
-     `(("gettext" ,gnu-gettext)))
+     `(("gettext" ,gettext-minimal)))
    (arguments
     `(#:tests? #f ; no test target
       #:python ,python-2   ; Python 3 apparently not yet supported, see
@ -122,7 +122,7 @@ as well as the classic centralized workflow.")
   (build-system gnu-build-system)
   (native-inputs
    `(("native-perl" ,perl)
-      ("gettext" ,gnu-gettext)
+      ("gettext" ,gettext-minimal)
      ("git-manpages"
       ,(origin
          (method url-fetch)
@ -921,7 +921,7 @@ accessed and migrated on modern systems.")
       ("file" ,file)
       ("libxml2" ,libxml2)
       ("zlib" ,zlib)
-       ("gettext" ,gnu-gettext)))
+       ("gettext" ,gettext-minimal)))
    (native-inputs
     `(("bison" ,bison)
       ("groff" ,groff)
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@ -130,7 +130,7 @@ Only \"Universal TUN/TAP device driver support\" is needed in the kernel.")
      ("vpnc" ,vpnc)
      ("zlib" ,zlib)))
   (native-inputs
-    `(("gettext" ,gnu-gettext)
+    `(("gettext" ,gettext-minimal)
      ("pkg-config" ,pkg-config)))
   (arguments
    `(#:configure-flags
--- a/gnu/packages/w3m.scm
+++ b/gnu/packages/w3m.scm
@ -69,7 +69,7 @@
       ("openssl" ,openssl)
       ("zlib" ,zlib)))
    (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("perl" ,perl)
       ("pkg-config" ,pkg-config)))
    (home-page "http://w3m.sourceforge.net/")
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@ -87,7 +87,7 @@
                                   "/include/gstreamer-1.0")))))))
    (native-inputs
     `(("bison" ,bison)
-       ("gettext" ,gnu-gettext)
+       ("gettext" ,gettext-minimal)
       ("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
       ("gobject-introspection" ,gobject-introspection)
       ("gperf" ,gperf)
--- a/gnu/packages/wicd.scm
+++ b/gnu/packages/wicd.scm
@ -52,7 +52,7 @@
                 "wicd-urwid-1.3.patch"
                 "wicd-wpa2-ttls.patch"))))
    (build-system python-build-system)
-    (native-inputs `(("gettext" ,gnu-gettext)))
+    (native-inputs `(("gettext" ,gettext-minimal)))
    (inputs `(("dbus-glib" ,dbus-glib)
              ("python2-dbus" ,python2-dbus)
              ("python2-pygtk" ,python2-pygtk)
--- a/gnu/packages/wine.scm
+++ b/gnu/packages/wine.scm
@ -63,7 +63,7 @@
                "1nmd65knzyh8b0yhxlqqvzai5rpnmhhm0c46n789zr5hj74jm6fg"))))
    (build-system gnu-build-system)
    (native-inputs `(("pkg-config" ,pkg-config)
-                     ("gettext" ,gnu-gettext)
+                     ("gettext" ,gettext-minimal)
                     ("flex" ,flex)
                     ("bison" ,bison)
                     ("perl" ,perl)))
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@ -90,7 +90,7 @@
             #t)))))
    (inputs `(("pygtk" ,python2-pygtk)
              ("xrandr" ,xrandr)))
-    (native-inputs `(("gettext"           ,gnu-gettext)
+    (native-inputs `(("gettext"           ,gettext-minimal)
                     ("python-docutils"   ,python2-docutils)
                     ("python-setuptools" ,python2-setuptools)))
    (home-page "https://christian.amsuess.com/tools/arandr/")
@ -1010,7 +1010,7 @@ by name.")
       ("libxrandr" ,libxrandr)
       ("startup-notification" ,startup-notification)))
    (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("pkg-config" ,pkg-config)))
    (home-page "https://gitlab.com/o9000/tint2")
    (synopsis "Lightweight task bar")
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@ -1430,7 +1430,7 @@ treat it as part of their software base when porting.")
            "07041q4k8m4nirzl7lrqn8by2zylx0xvh6n0za301qqs3njszgf5"))))
    (build-system gnu-build-system)
    (inputs
-      `(("gettext" ,gnu-gettext)
+      `(("gettext" ,gettext-minimal)
        ("libxt" ,libxt)
        ("xproto" ,xproto)
        ("libxext" ,libxext)))
@ -3800,7 +3800,7 @@ extension to the X11 protocol.  It includes:
            "1l6x2w357ja8vm94ns79s7yj9a5dlr01r9dxrjvzwncadiyr27f4"))))
    (build-system gnu-build-system)
    (inputs
-      `(("gettext" ,gnu-gettext)
+      `(("gettext" ,gettext-minimal)
        ("libx11" ,libx11)
        ("xkbcomp-intermediate" ,xkbcomp-intermediate)))
    (native-inputs
@ -4006,7 +4006,7 @@ Font Description (XLFD) full name for a font.")
       ("libxmu" ,libxmu)
       ("libxrender" ,libxrender)))
    (native-inputs
-     `(("gettext" ,gnu-gettext)
+     `(("gettext" ,gettext-minimal)
       ("pkg-config" ,pkg-config)))
    (home-page "https://www.x.org/wiki/")
    (synopsis "Display all the characters in an X font")