infra/nonguix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nongnu: firefox: Convert to new input style.

Browse Source 
* nongnu/packages/mozilla.scm (firefox)[arguments]: Rewrite
'wrap-program phase to work with gexp. Call udev as eudev which is its
real package name.
[inputs]: Convert to new style.
[native-inputs]: Dito.
This commit is contained in:
Jonathan Brielmaier 2022-02-26 22:48:38 +01:00
parent b5a8492a79
commit 80ff4afc44
No known key found for this signature in database
GPG Key ID: ECFC83988B4E4B9F
1 changed files with 72 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
nongnu/packages/mozilla.scm
View File

@ -301,20 +301,23 @@
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib")) (lib (string-append out "/lib"))
(ld-libs ;; TODO: make me a loop again
(map (lambda (x) (mesa-lib (string-append (assoc-ref inputs "mesa") "/lib"))
(string-append (assoc-ref inputs x) ;; For the integration of native notifications
"/lib")) (libnotify-lib (string-append (assoc-ref inputs "libnotify")
'("pulseaudio" "mesa" "/lib"))
"udev" ;; For U2F and WebAuthn ;; For hardware video acceleration via VA-API
;; For hardware video acceleration via VA-API (libva-lib (string-append (assoc-ref inputs "libva")
"libva" "/lib"))
;; For the integration of native notifications (pulseaudio-lib (string-append (assoc-ref inputs "pulseaudio")
"libnotify"))) "/lib"))
;; For U2F and WebAuthn
(eudev-lib (string-append (assoc-ref inputs "eudev") "/lib"))
(gtk-share (string-append (assoc-ref inputs "gtk+") (gtk-share (string-append (assoc-ref inputs "gtk+")
"/share"))) "/share")))
(wrap-program (car (find-files lib "^firefox$")) (wrap-program (car (find-files lib "^firefox$"))
`("LD_LIBRARY_PATH" prefix ,ld-libs) `("LD_LIBRARY_PATH" prefix (,mesa-lib ,libnotify-lib ,libva-lib
,pulseaudio-lib ,eudev-lib))
`("XDG_DATA_DIRS" prefix (,gtk-share)) `("XDG_DATA_DIRS" prefix (,gtk-share))
`("MOZ_LEGACY_PROFILES" = ("1")) `("MOZ_LEGACY_PROFILES" = ("1"))
`("MOZ_ALLOW_DOWNGRADE" = ("1")))))) `("MOZ_ALLOW_DOWNGRADE" = ("1"))))))
@ -355,63 +358,65 @@
;; Some dynamic lib was determined at runtime, so rpath check may fail. ;; Some dynamic lib was determined at runtime, so rpath check may fail.
#:validate-runpath? #f)) #:validate-runpath? #f))
(inputs (inputs
`(("bzip2" ,bzip2) (list
("cairo" ,cairo) bzip2
("cups" ,cups) cairo
("dbus-glib" ,dbus-glib) cups
("freetype" ,freetype) dbus-glib
("ffmpeg" ,ffmpeg) freetype
("gdk-pixbuf" ,gdk-pixbuf) ffmpeg
("glib" ,glib) gdk-pixbuf
("gtk+" ,gtk+) glib
("gtk+-2" ,gtk+-2) gtk+
("hunspell" ,hunspell) gtk+-2
("icu4c" ,icu4c-70) hunspell
("jemalloc" ,jemalloc) icu4c-70
("libcanberra" ,libcanberra) jemalloc
("libevent" ,libevent) libcanberra
("libffi" ,libffi) libevent
("libgnome" ,libgnome) libffi
("libjpeg-turbo" ,libjpeg-turbo) libgnome
("libnotify" ,libnotify) libjpeg-turbo
;; ("libpng-apng" ,libpng-apng) libnotify
("libva" ,libva) ;; libpng-apng
("libvpx" ,libvpx) libva
("libxcomposite" ,libxcomposite) libvpx
("libxft" ,libxft) libxcomposite
("libxinerama" ,libxinerama) libxft
("libxscrnsaver" ,libxscrnsaver) libxinerama
("libxt" ,libxt) libxscrnsaver
("mesa" ,mesa) libxt
("mit-krb5" ,mit-krb5) mesa
;; ("nspr" ,nspr) mit-krb5
;; ("nss" ,nss) ;; nspr
("pango" ,pango) ;; nss
("pixman" ,pixman) pango
("pulseaudio" ,pulseaudio) pixman
("startup-notification" ,startup-notification) pulseaudio
("sqlite" ,sqlite) startup-notification
("udev" ,eudev) sqlite
("unzip" ,unzip) eudev
("zip" ,zip) unzip
("zlib" ,zlib))) zip
zlib))
(native-inputs (native-inputs
`(("alsa-lib" ,alsa-lib) (list
("autoconf" ,autoconf-2.13) alsa-lib
("cargo" ,rust "cargo") autoconf-2.13
("clang" ,clang-12) `(,rust "cargo")
("llvm" ,llvm-12) clang-12
("wasm32-wasi-clang-toolchain" ,wasm32-wasi-clang-toolchain) llvm-12
("m4" ,m4) wasm32-wasi-clang-toolchain
("nasm" ,nasm) m4
("node" ,node) nasm
("perl" ,perl) node
("pkg-config" ,pkg-config) perl
("python" ,python) pkg-config
("rust" ,rust) python
("rust-cbindgen" ,rust-cbindgen-0.19) rust
("which" ,which) rust-cbindgen-0.19
("yasm" ,yasm))) which
yasm))
(home-page "https://mozilla.org/firefox/") (home-page "https://mozilla.org/firefox/")
(synopsis "Trademarkless version of Firefox") (synopsis "Trademarkless version of Firefox")
(description (description