Merge branch 'multiarch-container-locale-fix' into 'master'

nonguix: multiarch-container: Install locales after symlinking in fhs-internal.

See merge request nonguix/nonguix!728

nongnu/packages/video.scm

@@ -47,14 +47,6 @@
   (package
     (inherit ffmpeg)
     (name "ffmpeg-nvenc")
-    (version "6.1.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "0f2fr8ywchhlkdff88lr4d4vscqzsi1ndjh3r5jwbkayf94lcqiv"))))
     (inputs
      (modify-inputs
          (package-inputs ffmpeg)

nonguix/multiarch-container.scm

@@ -42,6 +42,7 @@
 (define-module (nonguix multiarch-container)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
   #:use-module (guix build-system trivial)
   #:use-module (guix gexp)
   #:use-module (guix records)
@@ -443,7 +444,9 @@ the exact path for the fhs-internal package."
                  (package-version (ngc-wrap-package container))))
     (source #f)
     (inputs `(("fhs-internal-script"
-               ,(make-internal-script container))))
+               ,(make-internal-script container))
+              ("bash-minimal" ,bash-minimal) ; for wrap-program
+              ))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))
@@ -452,9 +455,15 @@ the exact path for the fhs-internal package."
          (use-modules (guix build utils))
          (let* ((bin (string-append (assoc-ref %outputs "out") "/bin"))
                 (internal-target (assoc-ref %build-inputs "fhs-internal-script"))
-                (internal-dest (string-append bin "/" ,(ngc-internal-name container))))
+                (internal-dest (string-append bin "/" ,(ngc-internal-name container)))
+                (sh (string-append (assoc-ref %build-inputs "bash-minimal") "/bin/bash")))
            (mkdir-p bin)
-           (symlink internal-target internal-dest)))))
+           (symlink internal-target internal-dest)
+
+           ;; We want to install the locale manually after symlinking it.
+           ;; See <https://gitlab.com/nonguix/nonguix/-/issues/407>
+           (wrap-program internal-dest #:sh sh
+                         '("GUILE_INSTALL_LOCALE" = ("0")))))))
     (home-page #f)
     (synopsis "Script used to set up sandbox")
     (description "Script used inside the FHS Guix container to set up the
@@ -595,6 +604,14 @@ application."
              ;; See <https://gitlab.com/nonguix/nonguix/-/issues/384>
              (setenv "SDL_JOYSTICK_DISABLE_UDEV" "1")
 
+             ;; Try to install the locale after symlinking it.
+             ;; See <https://gitlab.com/nonguix/nonguix/-/issues/407>
+             (with-exception-handler
+                 (lambda _
+                   (format #t "\n\nFailed to install locale. Is glibc-locales available in the container?\n"))
+               (lambda _ (setlocale LC_ALL ""))
+               #:unwind? #t)
+
              ;; Process FHS-specific command line options.
              (let* ((options (getopt-long (or fhs-args '("")) fhs-option-spec))
                     (asound32-opt (option-ref options 'asound32 #f))