summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Brielmaier <jonathan.brielmaier@web.de>2022-02-26 22:48:38 +0100
committerJonathan Brielmaier <jonathan.brielmaier@web.de>2022-03-08 23:02:09 +0100
commit80ff4afc449ab12901196cad3e521797141be212 (patch)
tree7ad2af16b7c68177ba155e9a17c0e2ba8adfb3a8
parentb5a8492a79c991e6c58b1093338cdf011611f7f8 (diff)
nongnu: firefox: Convert to new input style.
* 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.
-rw-r--r--nongnu/packages/mozilla.scm139
1 files changed, 72 insertions, 67 deletions
diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm
index d9cea29..d7b32fe 100644
--- a/nongnu/packages/mozilla.scm
+++ b/nongnu/packages/mozilla.scm
@@ -301,20 +301,23 @@
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib"))
- (ld-libs
- (map (lambda (x)
- (string-append (assoc-ref inputs x)
- "/lib"))
- '("pulseaudio" "mesa"
- "udev" ;; For U2F and WebAuthn
- ;; For hardware video acceleration via VA-API
- "libva"
- ;; For the integration of native notifications
- "libnotify")))
+ ;; TODO: make me a loop again
+ (mesa-lib (string-append (assoc-ref inputs "mesa") "/lib"))
+ ;; For the integration of native notifications
+ (libnotify-lib (string-append (assoc-ref inputs "libnotify")
+ "/lib"))
+ ;; For hardware video acceleration via VA-API
+ (libva-lib (string-append (assoc-ref inputs "libva")
+ "/lib"))
+ (pulseaudio-lib (string-append (assoc-ref inputs "pulseaudio")
+ "/lib"))
+ ;; For U2F and WebAuthn
+ (eudev-lib (string-append (assoc-ref inputs "eudev") "/lib"))
(gtk-share (string-append (assoc-ref inputs "gtk+")
"/share")))
(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))
`("MOZ_LEGACY_PROFILES" = ("1"))
`("MOZ_ALLOW_DOWNGRADE" = ("1"))))))
@@ -355,63 +358,65 @@
;; Some dynamic lib was determined at runtime, so rpath check may fail.
#:validate-runpath? #f))
(inputs
- `(("bzip2" ,bzip2)
- ("cairo" ,cairo)
- ("cups" ,cups)
- ("dbus-glib" ,dbus-glib)
- ("freetype" ,freetype)
- ("ffmpeg" ,ffmpeg)
- ("gdk-pixbuf" ,gdk-pixbuf)
- ("glib" ,glib)
- ("gtk+" ,gtk+)
- ("gtk+-2" ,gtk+-2)
- ("hunspell" ,hunspell)
- ("icu4c" ,icu4c-70)
- ("jemalloc" ,jemalloc)
- ("libcanberra" ,libcanberra)
- ("libevent" ,libevent)
- ("libffi" ,libffi)
- ("libgnome" ,libgnome)
- ("libjpeg-turbo" ,libjpeg-turbo)
- ("libnotify" ,libnotify)
- ;; ("libpng-apng" ,libpng-apng)
- ("libva" ,libva)
- ("libvpx" ,libvpx)
- ("libxcomposite" ,libxcomposite)
- ("libxft" ,libxft)
- ("libxinerama" ,libxinerama)
- ("libxscrnsaver" ,libxscrnsaver)
- ("libxt" ,libxt)
- ("mesa" ,mesa)
- ("mit-krb5" ,mit-krb5)
- ;; ("nspr" ,nspr)
- ;; ("nss" ,nss)
- ("pango" ,pango)
- ("pixman" ,pixman)
- ("pulseaudio" ,pulseaudio)
- ("startup-notification" ,startup-notification)
- ("sqlite" ,sqlite)
- ("udev" ,eudev)
- ("unzip" ,unzip)
- ("zip" ,zip)
- ("zlib" ,zlib)))
+ (list
+ bzip2
+ cairo
+ cups
+ dbus-glib
+ freetype
+ ffmpeg
+ gdk-pixbuf
+ glib
+ gtk+
+ gtk+-2
+ hunspell
+ icu4c-70
+ jemalloc
+ libcanberra
+ libevent
+ libffi
+ libgnome
+ libjpeg-turbo
+ libnotify
+ ;; libpng-apng
+ libva
+ libvpx
+ libxcomposite
+ libxft
+ libxinerama
+ libxscrnsaver
+ libxt
+ mesa
+ mit-krb5
+ ;; nspr
+ ;; nss
+ pango
+ pixman
+ pulseaudio
+ startup-notification
+ sqlite
+ eudev
+ unzip
+ zip
+ zlib))
(native-inputs
- `(("alsa-lib" ,alsa-lib)
- ("autoconf" ,autoconf-2.13)
- ("cargo" ,rust "cargo")
- ("clang" ,clang-12)
- ("llvm" ,llvm-12)
- ("wasm32-wasi-clang-toolchain" ,wasm32-wasi-clang-toolchain)
- ("m4" ,m4)
- ("nasm" ,nasm)
- ("node" ,node)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("python" ,python)
- ("rust" ,rust)
- ("rust-cbindgen" ,rust-cbindgen-0.19)
- ("which" ,which)
- ("yasm" ,yasm)))
+ (list
+ alsa-lib
+ autoconf-2.13
+ `(,rust "cargo")
+ clang-12
+ llvm-12
+ wasm32-wasi-clang-toolchain
+ m4
+ nasm
+ node
+ perl
+ pkg-config
+ python
+ rust
+ rust-cbindgen-0.19
+ which
+ yasm))
(home-page "https://mozilla.org/firefox/")
(synopsis "Trademarkless version of Firefox")
(description