mirror of
https://gitlab.com/nonguix/nonguix.git
synced 2025-10-02 02:14:59 +00:00
Compare commits
12 commits
0ee7706cac
...
d0bfac6362
Author | SHA1 | Date | |
---|---|---|---|
|
d0bfac6362 | ||
|
57c186c44f | ||
|
3cf2590392 | ||
|
4d6bc7d0dc | ||
|
554e6e6b43 | ||
|
4d8e51fa6f | ||
|
07914de637 | ||
|
5da1544521 | ||
|
8e65d6358b | ||
|
3df17f84ac | ||
|
c71fffec9d | ||
|
0e902d14e4 |
9 changed files with 278 additions and 75 deletions
|
@ -5,16 +5,19 @@
|
|||
;;; Copyright © 2024 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||
;;; Copyright © 2025 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
|
||||
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
|
||||
|
||||
(define-module (nongnu packages electron)
|
||||
#:use-module (nonguix build-system chromium-binary)
|
||||
#:use-module ((nonguix licenses) :prefix license:)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages gtk)
|
||||
#:use-module (gnu packages nss)
|
||||
#:use-module (gnu packages video))
|
||||
|
||||
(define (electron-source version hash)
|
||||
|
@ -42,47 +45,39 @@
|
|||
"0qs5n6m0gj0rknjq5aqrbbpqwh2829a1cl51l6xj79p7aiggb9p3"))
|
||||
(build-system chromium-binary-build-system)
|
||||
(arguments
|
||||
`(#:wrapper-plan
|
||||
`("electron"
|
||||
"libffmpeg.so"
|
||||
"libGLESv2.so"
|
||||
"libEGL.so")
|
||||
#:install-plan
|
||||
`(("." "share/electron/" #:include
|
||||
("electron"
|
||||
"chrome-sandbox"
|
||||
"chrome_100_percent.pak"
|
||||
"chrome_200_percent.pak"
|
||||
"chrome_crashpad_handler"
|
||||
"icudtl.dat"
|
||||
"resources.pak"
|
||||
"v8_context_snapshot.bin"
|
||||
"version"
|
||||
"libffmpeg.so"
|
||||
;; electron seems to force-load these from its directory.
|
||||
"libEGL.so"
|
||||
"libGLESv2.so"))
|
||||
("resources" "share/electron/")
|
||||
("locales" "share/electron/"))
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'install-wrapper 'wrap-where-patchelf-does-not-work
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(bin (string-append out "/share/electron/electron"))
|
||||
(wrapper (string-append out "/bin/electron")))
|
||||
(mkdir-p (dirname wrapper))
|
||||
(make-wrapper wrapper bin
|
||||
`("LD_LIBRARY_PATH" ":"
|
||||
prefix
|
||||
(,(string-join
|
||||
(list
|
||||
(string-append out "/share/electron"))
|
||||
":")))))
|
||||
#t)))))
|
||||
(native-inputs `(("unzip" ,unzip)))
|
||||
(inputs `(("gdk-pixbuf" ,gdk-pixbuf)
|
||||
("ffmpeg" ,ffmpeg)))
|
||||
(list
|
||||
#:wrapper-plan
|
||||
#~'(("electron" (("out" "/share/electron")
|
||||
("nss" "/lib/nss")))
|
||||
"chrome-sandbox"
|
||||
"chrome_crashpad_handler")
|
||||
#:install-plan
|
||||
#~'(("." "share/electron/" #:include
|
||||
("electron"
|
||||
"chrome-sandbox"
|
||||
"chrome_100_percent.pak"
|
||||
"chrome_200_percent.pak"
|
||||
"chrome_crashpad_handler"
|
||||
"icudtl.dat"
|
||||
"resources.pak"
|
||||
"v8_context_snapshot.bin"
|
||||
"version"
|
||||
"libffmpeg.so"
|
||||
;; electron seems to force-load these from its directory.
|
||||
"libEGL.so"
|
||||
"libGLESv2.so"))
|
||||
("resources" "share/electron/")
|
||||
("locales" "share/electron/"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'symlink-binary-file
|
||||
(lambda _
|
||||
(let ((bin (string-append #$output "/bin")))
|
||||
(mkdir-p bin)
|
||||
(symlink (string-append #$output "/share/electron/electron")
|
||||
(string-append bin "/electron"))))))))
|
||||
(native-inputs (list unzip))
|
||||
(inputs (list ffmpeg gdk-pixbuf nss))
|
||||
(home-page "https://www.electronjs.org/")
|
||||
(synopsis "Cross platform desktop application shell")
|
||||
(description "The Electron framework lets you write cross-platform desktop
|
||||
|
|
|
@ -108,7 +108,7 @@ implementation with gogdl and Amazon Games using Nile.")
|
|||
(define steam-client
|
||||
(package
|
||||
(name "steam-client")
|
||||
(version "1.0.0.82")
|
||||
(version "1.0.0.83")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -116,7 +116,7 @@ implementation with gogdl and Amazon Games using Nile.")
|
|||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xzwwvvh046mrcqil92lwda3dz8anhx8y2x3bdj2pzbicbfz38mg"))
|
||||
"10lgmjsada0n2a4h1vgrnwcjcka7vp4igy82f1n99zbyrjq845kr"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
|
|
|
@ -352,14 +352,14 @@ stable, responsive and smooth desktop experience.")))
|
|||
(define-public linux-firmware
|
||||
(package
|
||||
(name "linux-firmware")
|
||||
(version "20250509")
|
||||
(version "20250613")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://kernel.org/linux/kernel/firmware/"
|
||||
"linux-firmware-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0gkhpl60iw83pa8pq4hf8rrrc8nk8kjychsnrcq838i6y9k0vipj"))))
|
||||
"1pkz38wi9gljipzs9d2wri97p866vqqan872hwjrvgx8ghrl61yl"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f
|
||||
|
|
|
@ -34,6 +34,130 @@
|
|||
#:use-module ((nonguix licenses) :prefix license:)
|
||||
#:use-module (ice-9 match))
|
||||
|
||||
(define-public discord
|
||||
(package
|
||||
(name "discord")
|
||||
(version "0.0.20")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append
|
||||
"https://dl.discordapp.net/apps/linux/" version "/" name "-" version ".deb"))
|
||||
(sha256
|
||||
(base32 "036pg6xi6jwn7qadfbdq88w55mwyszy83sq4xnfbhm1xw5gmn16n"))))
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(build-system binary-build-system)
|
||||
(arguments
|
||||
(list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files
|
||||
#:patchelf-plan
|
||||
#~'(("lib/discord/Discord"
|
||||
("alsa-lib" "at-spi2-atk" "at-spi2-core" "atk" "cairo" "cups"
|
||||
"dbus" "expat" "fontconfig-minimal" "gcc" "gdk-pixbuf" "glib"
|
||||
"gtk+" "libdrm" "libnotify" "libx11" "libxcb"
|
||||
"libxcomposite" "libxcursor" "libxdamage" "libxext" "libxfixes"
|
||||
"libxi" "libxkbcommon" "libxkbfile" "libxrandr" "libxshmfence"
|
||||
"libxrender" "libxkbcommon" "libxkbfile" "libxrandr" "libxtst"
|
||||
"libxtst" "mesa" "nspr" "pango" "pulseaudio" "zlib")))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda _
|
||||
(invoke "ar" "x" #$source)
|
||||
(invoke "tar" "xvf" "data.tar.gz")
|
||||
(copy-recursively "usr/" ".")
|
||||
;; Use the more standard lib directory for everything.
|
||||
(mkdir-p "lib")
|
||||
(rename-file "share/discord" "lib/discord")
|
||||
;; Remove unneeded files.
|
||||
(delete-file-recursively "bin")
|
||||
(delete-file "control.tar.gz")
|
||||
(delete-file "data.tar.gz")
|
||||
(delete-file "debian-binary")))
|
||||
(add-after 'unpack 'fix-desktop-file
|
||||
(lambda _
|
||||
;; Fix the .desktop file binary location.
|
||||
(rename-file "lib/discord/discord.desktop" "share/applications/discord.desktop")
|
||||
(substitute* '("share/applications/discord.desktop")
|
||||
(("/usr/share/")
|
||||
(string-append #$output "/lib/")))
|
||||
;; And move the icon, replacing the (broken) symlink.
|
||||
(rename-file "lib/discord/discord.png" "share/pixmaps/discord.png")))
|
||||
(add-after 'install 'symlink-binary-file-and-cleanup
|
||||
(lambda _
|
||||
(delete-file (string-append #$output "/environment-variables"))
|
||||
(mkdir-p (string-append #$output "/bin"))
|
||||
(symlink (string-append #$output "/lib/discord/Discord")
|
||||
(string-append #$output "/bin/discord"))))
|
||||
(add-after 'install 'wrap-where-patchelf-does-not-work
|
||||
(lambda _
|
||||
(wrap-program (string-append #$output "/lib/discord/Discord")
|
||||
`("FONTCONFIG_PATH" ":" prefix
|
||||
(,(string-join
|
||||
(list
|
||||
(string-append #$(this-package-input "fontconfig-minimal") "/etc/fonts")
|
||||
#$output)
|
||||
":")))
|
||||
`("LD_LIBRARY_PATH" ":" prefix
|
||||
(,(string-join
|
||||
(list
|
||||
(string-append #$(this-package-input "nss") "/lib/nss")
|
||||
(string-append #$(this-package-input "eudev") "/lib")
|
||||
(string-append #$(this-package-input "gcc") "/lib")
|
||||
(string-append #$(this-package-input "libnotify") "/lib")
|
||||
(string-append #$(this-package-input "libxkbfile") "/lib")
|
||||
(string-append #$(this-package-input "mesa") "/lib")
|
||||
(string-append #$(this-package-input "pulseaudio") "/lib")
|
||||
(string-append #$(this-package-input "sqlcipher") "/lib")
|
||||
(string-append #$(this-package-input "zlib") "/lib")
|
||||
(string-append #$output "/lib/discord")
|
||||
#$output)
|
||||
":")))))))))
|
||||
(native-inputs (list tar))
|
||||
(inputs
|
||||
(list alsa-lib
|
||||
at-spi2-atk
|
||||
at-spi2-core
|
||||
atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
eudev
|
||||
expat
|
||||
fontconfig
|
||||
`(,gcc "lib")
|
||||
glib
|
||||
gtk+
|
||||
libdrm
|
||||
libnotify
|
||||
librsvg
|
||||
libx11
|
||||
libxcb
|
||||
libxcomposite
|
||||
libxcursor
|
||||
libxdamage
|
||||
libxext
|
||||
libxfixes
|
||||
libxi
|
||||
libxkbcommon
|
||||
libxkbfile
|
||||
libxrandr
|
||||
libxrender
|
||||
libxshmfence
|
||||
libxtst
|
||||
mesa
|
||||
nspr
|
||||
nss
|
||||
pango
|
||||
pulseaudio
|
||||
sqlcipher
|
||||
zlib))
|
||||
(home-page "https://discord.com/")
|
||||
(synopsis "All-in-one voice, video, and text chat for gamers")
|
||||
(description "Discord is a cross-platform text, voice, and video chat platform aimed at
|
||||
gamers.")
|
||||
(license (license:nonfree "https://discord.com/terms"))))
|
||||
|
||||
(define-public element-desktop
|
||||
(package
|
||||
(name "element-desktop")
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
;;; Copyright © 2020-2025 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
||||
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
|
||||
;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com>
|
||||
;;; Copyright © 2021, 2024 Brice Waegeneire <brice@waegenei.re>
|
||||
;;; Copyright © 2021, 2024, 2025 Brice Waegeneire <brice@waegenei.re>
|
||||
;;; Copyright © 2021, 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
|
||||
;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;; Copyright © 2023-2025 Tomas Volf <wolf@wolfsden.cz>
|
||||
|
@ -63,6 +63,7 @@
|
|||
#:use-module (gnu packages node)
|
||||
#:use-module (gnu packages nss)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages pciutils)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages pulseaudio)
|
||||
#:use-module (gnu packages python)
|
||||
|
@ -86,19 +87,19 @@
|
|||
|
||||
;; Update this id with every firefox update to its release date.
|
||||
;; It's used for cache validation and therefore can lead to strange bugs.
|
||||
(define %firefox-esr-build-id "20250526081800")
|
||||
(define %firefox-esr-build-id "20250623124138")
|
||||
|
||||
(define-public firefox-esr
|
||||
(package
|
||||
(name "firefox-esr")
|
||||
(version "128.11.0esr")
|
||||
(version "128.12.0esr")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://archive.mozilla.org/pub/firefox/releases/"
|
||||
version "/source/firefox-" version ".source.tar.xz"))
|
||||
(sha256
|
||||
(base32 "1v7zl6krm2vk3j30fd8zbnazvbqiwg93dgymrznfa3v798vr1vgj"))
|
||||
(base32 "0gwpkpl053jv8j7bl8cjdqngxfj5wbj2mm48rqzws5nbqs3fpv9b"))
|
||||
(patches
|
||||
(map (lambda (patch)
|
||||
(search-path
|
||||
|
@ -106,7 +107,8 @@
|
|||
%load-path)
|
||||
patch))
|
||||
'("firefox-esr-compare-paths.patch"
|
||||
"firefox-esr-use-system-wide-dir.patch")))
|
||||
"firefox-esr-use-system-wide-dir.patch"
|
||||
"firefox-esr-add-store-to-rdd-allowlist.patch")))
|
||||
;; XXX: 75 Mo (800+ Mo uncompressed) of unused tests.
|
||||
;; Removing it makes it possible to compile on some systems.
|
||||
(modules '((guix build utils)))
|
||||
|
@ -351,6 +353,20 @@
|
|||
(string-drop hash 8)))))))
|
||||
(replace 'install
|
||||
(lambda _ (invoke "./mach" "install")))
|
||||
(add-after 'install 'wrap-glxtest
|
||||
;; glxtest uses dlopen() to load mesa and pci
|
||||
;; libs, wrap it to set LD_LIBRARY_PATH.
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(lib (string-append out "/lib"))
|
||||
(libs (map
|
||||
(lambda (lib-name)
|
||||
(string-append (assoc-ref inputs
|
||||
lib-name)
|
||||
"/lib"))
|
||||
'("mesa" "pciutils"))))
|
||||
(wrap-program (car (find-files lib "^glxtest$"))
|
||||
`("LD_LIBRARY_PATH" prefix ,libs)))))
|
||||
(add-after 'install 'wrap-program
|
||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||
;; The following two functions are from Guix's icecat package in
|
||||
|
@ -380,28 +396,11 @@
|
|||
;; and libva depend on).
|
||||
(pciaccess-lib (string-append (assoc-ref inputs "libpciaccess")
|
||||
"/lib"))
|
||||
;; VA-API is run in the RDD (Remote Data Decoder) sandbox
|
||||
;; and must be explicitly given access to files it needs.
|
||||
;; Rather than adding the whole store (as Nix had
|
||||
;; upstream do, see
|
||||
;; <https://github.com/NixOS/nixpkgs/pull/165964> and
|
||||
;; linked upstream patches), we can just follow the
|
||||
;; runpaths of the needed libraries to add everything to
|
||||
;; LD_LIBRARY_PATH. These will then be accessible in the
|
||||
;; RDD sandbox.
|
||||
;; TODO: Properly handle the runpath of libraries needed
|
||||
;; (for RDD) recursively, so the explicit libpciaccess
|
||||
;; can be removed.
|
||||
(rdd-whitelist
|
||||
(map (cut string-append <> "/")
|
||||
(delete-duplicates
|
||||
(append-map runpaths-of-input
|
||||
'("mesa" "ffmpeg")))))
|
||||
(pulseaudio-lib (string-append (assoc-ref inputs "pulseaudio")
|
||||
"/lib"))
|
||||
;; For sharing on Wayland
|
||||
(pipewire-lib (string-append (assoc-ref inputs "pipewire")
|
||||
"/lib"))
|
||||
"/lib"))
|
||||
;; For U2F and WebAuthn
|
||||
(eudev-lib (string-append (assoc-ref inputs "eudev") "/lib"))
|
||||
(gtk-share (string-append (assoc-ref inputs "gtk+")
|
||||
|
@ -409,7 +408,7 @@
|
|||
(wrap-program (car (find-files lib "^firefox$"))
|
||||
`("LD_LIBRARY_PATH" prefix (,mesa-lib ,libnotify-lib ,libva-lib
|
||||
,pciaccess-lib ,pulseaudio-lib ,eudev-lib
|
||||
,@rdd-whitelist ,pipewire-lib))
|
||||
,pipewire-lib))
|
||||
`("XDG_DATA_DIRS" prefix (,gtk-share))
|
||||
`("MOZ_LEGACY_PROFILES" = ("1"))
|
||||
`("MOZ_ALLOW_DOWNGRADE" = ("1"))))))
|
||||
|
@ -485,6 +484,7 @@
|
|||
nspr-4.32
|
||||
;; nss
|
||||
pango
|
||||
pciutils
|
||||
pipewire
|
||||
pixman
|
||||
pulseaudio
|
||||
|
@ -528,20 +528,20 @@ Release (ESR) version.")
|
|||
|
||||
;; Update this id with every firefox update to its release date.
|
||||
;; It's used for cache validation and therefore can lead to strange bugs.
|
||||
(define %firefox-build-id "20250609195321")
|
||||
(define %firefox-build-id "20250623125307")
|
||||
|
||||
(define-public firefox
|
||||
(package
|
||||
(inherit firefox-esr)
|
||||
(name "firefox")
|
||||
(version "139.0.4")
|
||||
(version "140.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://archive.mozilla.org/pub/firefox/releases/"
|
||||
version "/source/firefox-" version ".source.tar.xz"))
|
||||
(sha256
|
||||
(base32 "1xc7481g9adrn98ivqgigvdjcpkyk6sa183qvpbwcjgrqczhapjk"))
|
||||
(base32 "07zxz49qj5d8h8s4w6nw9j8x7wfrw45zc3a9bny1l911kfs564pf"))
|
||||
(patches
|
||||
(map (lambda (patch)
|
||||
(search-path
|
||||
|
@ -550,7 +550,8 @@ Release (ESR) version.")
|
|||
patch))
|
||||
'("firefox-restore-desktop-files.patch"
|
||||
"firefox-ge-138-compare-paths.patch"
|
||||
"firefox-use-system-wide-dir.patch")))
|
||||
"firefox-use-system-wide-dir.patch"
|
||||
"firefox-add-store-to-rdd-allowlist.patch")))
|
||||
;; XXX: 75 Mo (800+ Mo uncompressed) of unused tests.
|
||||
;; Removing it makes it possible to compile on some systems.
|
||||
(modules '((guix build utils)))
|
||||
|
|
|
@ -0,0 +1,36 @@
|
|||
diff --git a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
|
||||
index 4eff5e6..42171eb 100644
|
||||
--- a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
|
||||
+++ b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
|
||||
@@ -476,6 +476,7 @@ void SandboxBrokerPolicyFactory::InitContentPolicy() {
|
||||
// Various places where fonts reside
|
||||
policy->AddTree(rdonly, "/usr/X11R6/lib/X11/fonts");
|
||||
policy->AddTree(rdonly, "/nix/store");
|
||||
+ policy->AddTree(rdonly, "/gnu/store");
|
||||
// https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/blob/e434e680d22260f277f4a30ec4660ed32b591d16/files/fontconfig-flatpak.conf
|
||||
policy->AddTree(rdonly, "/run/host/fonts");
|
||||
policy->AddTree(rdonly, "/run/host/user-fonts");
|
||||
@@ -485,6 +486,7 @@ void SandboxBrokerPolicyFactory::InitContentPolicy() {
|
||||
// Bug 1848615
|
||||
policy->AddPath(rdonly, "/usr");
|
||||
policy->AddPath(rdonly, "/nix");
|
||||
+ policy->AddPath(rdonly, "/gnu");
|
||||
|
||||
AddLdconfigPaths(policy);
|
||||
AddLdLibraryEnvPaths(policy);
|
||||
@@ -934,6 +936,7 @@ SandboxBrokerPolicyFactory::GetRDDPolicy(int aPid) {
|
||||
policy->AddTree(rdonly, "/usr/lib64");
|
||||
policy->AddTree(rdonly, "/run/opengl-driver/lib");
|
||||
policy->AddTree(rdonly, "/nix/store");
|
||||
+ policy->AddTree(rdonly, "/gnu/store");
|
||||
|
||||
// Bug 1647957: memory reporting.
|
||||
AddMemoryReporting(policy.get(), aPid);
|
||||
@@ -1079,6 +1082,7 @@ SandboxBrokerPolicyFactory::GetUtilityProcessPolicy(int aPid) {
|
||||
// Required to make sure ffmpeg loads properly, this is already existing on
|
||||
// Content and RDD
|
||||
policy->AddTree(rdonly, "/nix/store");
|
||||
+ policy->AddTree(rdonly, "/gnu/store");
|
||||
|
||||
// glibc will try to stat64("/") while populating nsswitch database
|
||||
// https://sourceware.org/git/?p=glibc.git;a=blob;f=nss/nss_database.c;h=cf0306adc47f12d9bc761ab1b013629f4482b7e6;hb=9826b03b747b841f5fc6de2054bf1ef3f5c4bdf3#l396
|
|
@ -0,0 +1,36 @@
|
|||
diff --git a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
|
||||
index 0e5358e68e..efbde9616e 100644
|
||||
--- a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
|
||||
+++ b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
|
||||
@@ -452,6 +452,7 @@ void SandboxBrokerPolicyFactory::InitContentPolicy() {
|
||||
// Various places where fonts reside
|
||||
policy->AddDir(rdonly, "/usr/X11R6/lib/X11/fonts");
|
||||
policy->AddDir(rdonly, "/nix/store");
|
||||
+ policy->AddDir(rdonly, "/gnu/store");
|
||||
// https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/blob/e434e680d22260f277f4a30ec4660ed32b591d16/files/fontconfig-flatpak.conf
|
||||
policy->AddDir(rdonly, "/run/host/fonts");
|
||||
policy->AddDir(rdonly, "/run/host/user-fonts");
|
||||
@@ -461,6 +462,7 @@ void SandboxBrokerPolicyFactory::InitContentPolicy() {
|
||||
// Bug 1848615
|
||||
policy->AddPath(rdonly, "/usr");
|
||||
policy->AddPath(rdonly, "/nix");
|
||||
+ policy->AddPath(rdonly, "/gnu");
|
||||
|
||||
AddLdconfigPaths(policy);
|
||||
AddLdLibraryEnvPaths(policy);
|
||||
@@ -920,6 +922,7 @@ SandboxBrokerPolicyFactory::GetRDDPolicy(int aPid) {
|
||||
policy->AddDir(rdonly, "/usr/lib64");
|
||||
policy->AddDir(rdonly, "/run/opengl-driver/lib");
|
||||
policy->AddDir(rdonly, "/nix/store");
|
||||
+ policy->AddDir(rdonly, "/gnu/store");
|
||||
|
||||
// Bug 1647957: memory reporting.
|
||||
AddMemoryReporting(policy.get(), aPid);
|
||||
@@ -1043,6 +1046,7 @@ SandboxBrokerPolicyFactory::GetUtilityProcessPolicy(int aPid) {
|
||||
// Required to make sure ffmpeg loads properly, this is already existing on
|
||||
// Content and RDD
|
||||
policy->AddDir(rdonly, "/nix/store");
|
||||
+ policy->AddDir(rdonly, "/gnu/store");
|
||||
|
||||
// glibc will try to stat64("/") while populating nsswitch database
|
||||
// https://sourceware.org/git/?p=glibc.git;a=blob;f=nss/nss_database.c;h=cf0306adc47f12d9bc761ab1b013629f4482b7e6;hb=9826b03b747b841f5fc6de2054bf1ef3f5c4bdf3#l396
|
|
@ -32,7 +32,7 @@
|
|||
(define-public anytype
|
||||
(package
|
||||
(name "anytype")
|
||||
(version "0.46.8")
|
||||
(version "0.47.3")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -42,7 +42,7 @@
|
|||
(file-name (string-append "anytype-" version ".deb"))
|
||||
(sha256
|
||||
(base32
|
||||
"1mdjjda1n62i39ggivkm9vzxskrk71l9c181pjz0qgrc12817qli"))))
|
||||
"1f95mchvjlxqam4qn6ip377hdccny6xa526d7c64micgkfbx6ai3"))))
|
||||
(build-system chromium-binary-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
|
|
@ -134,6 +134,17 @@ graphics hardware.")
|
|||
" This build of intel-media-driver includes nonfree blobs to fully enable the
|
||||
video decode capabilities of supported Intel GPUs."))))
|
||||
|
||||
(define-public mpv-nvidia
|
||||
(package
|
||||
(inherit mpv)
|
||||
(name "mpv-nvidia")
|
||||
(inputs
|
||||
(modify-inputs (package-inputs mpv)
|
||||
(prepend nv-codec-headers)))
|
||||
(synopsis
|
||||
"Audio and video player (with hardware acceleration for NVIDIA graphics \
|
||||
cards)")))
|
||||
|
||||
(define-public nv-codec-headers
|
||||
(package
|
||||
(name "nv-codec-headers")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue