amaharaneko/nonguix-mirrors
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2025-10-02 02:14:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: amaharaneko:1e648f228404001bc94c82a38ecabbb17b989637
Branches Tags
amaharaneko:master
amaharaneko:update-and-fix-linux-firmware
amaharaneko:grayjay
amaharaneko:feature/bump-intel-media-driver
amaharaneko:test
amaharaneko:feature/bump-default-linux
amaharaneko:extend-wrapper-plan
amaharaneko:beacondb-api-key
amaharaneko:add-rpath
amaharaneko:keyring
amaharaneko:make-authenticate
amaharaneko:steam-updates
amaharaneko:heroic
amaharaneko:core-updates
amaharaneko:mesa-next
amaharaneko:hack-hashes
amaharaneko:kernel-rewrite
amaharaneko:firefox-sandbox-for-vaapi
amaharaneko:discord
amaharaneko:rework-structure
amaharaneko:linux-updater
amaharaneko:add-skype
amaharaneko:wip-mono
amaharaneko:new-install-plan
amaharaneko:v1.4.0
...
compare: amaharaneko:7d62bac6a18bd3f1bbcac55f070d5f04a854a267
Branches Tags
amaharaneko:master
amaharaneko:update-and-fix-linux-firmware
amaharaneko:grayjay
amaharaneko:feature/bump-intel-media-driver
amaharaneko:test
amaharaneko:feature/bump-default-linux
amaharaneko:extend-wrapper-plan
amaharaneko:beacondb-api-key
amaharaneko:add-rpath
amaharaneko:keyring
amaharaneko:make-authenticate
amaharaneko:steam-updates
amaharaneko:heroic
amaharaneko:core-updates
amaharaneko:mesa-next
amaharaneko:hack-hashes
amaharaneko:kernel-rewrite
amaharaneko:firefox-sandbox-for-vaapi
amaharaneko:discord
amaharaneko:rework-structure
amaharaneko:linux-updater
amaharaneko:add-skype
amaharaneko:wip-mono
amaharaneko:new-install-plan
amaharaneko:v1.4.0

3 commits
1e648f2284 ... 7d62bac6a1

Author SHA1 Message Date
Noah Evans
7d62bac6a1 Merge branch 'multiarch-container-locale-fix' into 'master' 
nonguix: multiarch-container: Install locales after symlinking in fhs-internal.

See merge request nonguix/nonguix!728
 2025-09-30 22:46:42 +00:00
John Kehayias
89f0dca2eb
nongnu: firefox-esr: Use ffmpeg-6. 
This fixes video playback post mesa-updates merge in Guix.  See upstream issue
<https://bugzilla.mozilla.org/show_bug.cgi?id=1962139>; fix is like for
librewolf in Guix, see <https://codeberg.org/guix/guix/issues/3038>.

* nongnu/packages/mozilla.scm (firefox-esr)[inputs]: Change ffmpeg to
ffmpeg-6.
 2025-09-30 11:12:52 -04:00
Noah Evans
b8ff269aeb nonguix: multiarch-container: Try to install locale after symlinking. 
* nonguix/multiarch-container.scm (make-container-internal): Wrap
fhs-internal-script with GUILE_INSTALL_LOCALE=0.
* (make-internal-script): Try to install the locale after creating symlinks.
 2025-08-11 07:45:25 -04:00
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nongnu/packages/mozilla.scm
View file

@ -457,7 +457,7 @@
cups cups
dbus-glib dbus-glib
freetype freetype
ffmpeg ffmpeg-6
gdk-pixbuf gdk-pixbuf
glib glib
gtk+ gtk+

23
nonguix/multiarch-container.scm
View file

@ -42,6 +42,7 @@
(define-module (nonguix multiarch-container) (define-module (nonguix multiarch-container)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix records) #:use-module (guix records)
@ -443,7 +444,9 @@ the exact path for the fhs-internal package."
(package-version (ngc-wrap-package container)))) (package-version (ngc-wrap-package container))))
(source #f) (source #f)
(inputs `(("fhs-internal-script" (inputs `(("fhs-internal-script"
,(make-internal-script container)))) ,(make-internal-script container))
("bash-minimal" ,bash-minimal) ; for wrap-program
))
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments (arguments
`(#:modules ((guix build utils)) `(#:modules ((guix build utils))
@ -452,9 +455,15 @@ the exact path for the fhs-internal package."
(use-modules (guix build utils)) (use-modules (guix build utils))
(let* ((bin (string-append (assoc-ref %outputs "out") "/bin")) (let* ((bin (string-append (assoc-ref %outputs "out") "/bin"))
(internal-target (assoc-ref %build-inputs "fhs-internal-script")) (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) (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) (home-page #f)
(synopsis "Script used to set up sandbox") (synopsis "Script used to set up sandbox")
(description "Script used inside the FHS Guix container to set up the (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> ;; See <https://gitlab.com/nonguix/nonguix/-/issues/384>
(setenv "SDL_JOYSTICK_DISABLE_UDEV" "1") (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. ;; Process FHS-specific command line options.
(let* ((options (getopt-long (or fhs-args '("")) fhs-option-spec)) (let* ((options (getopt-long (or fhs-args '("")) fhs-option-spec))
(asound32-opt (option-ref options 'asound32 #f)) (asound32-opt (option-ref options 'asound32 #f))