aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanketsu <hanketsu@egregore.fun>2024-10-28 02:55:31 +0100
committerHanketsu <hanketsu@egregore.fun>2025-06-13 00:04:38 +0200
commitd8a7da5b11ff8072114c4df28c354ede6d6180aa (patch)
tree44414c2a53c56e6facef6b4be249448f58c40b4d
parent1c3b00e052091619736214481c91eb9354222290 (diff)
battering: palemoon: Remove some vendored libraries
* battering/packages/palemoon.scm (palemoon): Unvendor libraries.
-rw-r--r--battering/packages/palemoon.scm45
1 files changed, 26 insertions, 19 deletions
diff --git a/battering/packages/palemoon.scm b/battering/packages/palemoon.scm
index d3b7b22..3faea3d 100644
--- a/battering/packages/palemoon.scm
+++ b/battering/packages/palemoon.scm
@@ -18,6 +18,7 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages image)
#:use-module (gnu packages linux)
#:use-module (gnu packages m4)
#:use-module (gnu packages nss)
@@ -69,22 +70,26 @@
zip))
(inputs
(list bash-minimal
+ alsa-lib
+ bzip2
+ dbus-glib
+ desktop-file-utils
+ ffmpeg
+ gconf
+ glib
(if with-gtk3?
gtk+
gtk+-2)
- glib
- dbus-glib
- libdbusmenu
- desktop-file-utils
libaom
+ libdbusmenu
+ libjpeg-turbo
+ libxcomposite
libxt
+ mesa
openssl
- sqlite
- alsa-lib
pulseaudio
- ffmpeg
- mesa
- gconf))
+ sqlite
+ zlib))
(arguments
(let* ((gtk-version (if with-gtk3? "gtk3" "gtk2"))
(branding-dir (format #f "~a/branding/~a" name branding))
@@ -121,34 +126,36 @@
"--enable-optimize=\"-O2 -w\""
"--enable-strip"
"--enable-system-ffi"
+ "--enable-system-cairo"
"--enable-system-pixman"
+ "--enable-system-extension-dirs"
"--disable-debug"
- "--disable-debug-symbols"
"--disable-debug-js-modules"
+ "--disable-debug-symbols"
"--disable-elf-hack"
"--disable-gamepad"
"--disable-gold"
"--disable-tests"
"--disable-updater"
"--disable-webrtc"
- ;; "--with-gl-provider=EGL"
"--with-pthreads"
+ "--with-system-bz2"
+ "--with-system-jpeg"
+ "--with-system-zlib"
"--with-x"
;; Avoid bundled libraries.
- ;; UNBUNDLE-ME! "--enable-system-sqlite"
- ;; UNBUNDLE-ME! "--with-system-bz2"
+ ;; UNBUNDLE-ME! "--system-sqlite"
;; UNBUNDLE-ME! "--with-system-graphite2"
;; UNBUNDLE-ME! "--with-system-harfbuzz"
+ ;; UNBUNDLE-ME! "--with-system-icu"
;; UNBUNDLE-ME! "--with-system-libevent"
;; UNBUNDLE-ME! "--with-system-libvpx"
- ;; UNBUNDLE-ME! "--with-system-nss" ; pending upgrade of 'nss' to 3.90
+ ;; UNBUNDLE-ME! "--with-system-nspr"
+ ;; UNBUNDLE-ME! "--with-system-nss"
;; UNBUNDLE-ME! "--with-system-ogg"
- ;; UNBUNDLE-ME! "--with-system-theora" ; wants theora-1.2, not yet released
+ ;; UNBUNDLE-ME! "--with-system-png"
+ ;; UNBUNDLE-ME! "--with-system-theora"
;; UNBUNDLE-ME! "--with-system-vorbis"
- ;; UNBUNDLE-ME! "--with-system-jpeg" ;must be libjpeg-turbo
- ;; UNBUNDLE-ME! "--with-system-zlib"
- ;; UNBUNDLE-ME! "--with-system-icu"
- ;; UNBUNDLE-ME! "--with-system-png" ;must be libpng-apng
#$(if with-gtk3? ;; NPAPI requires gtk2. It's for Adobe Flash and Silverlight.
"--disable-npapi"
"--enable-npapi")