public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

palemoon: add ffmpeg, remove unused dependencies

Browse Source 
· added ffmpeg to runtime libraries (via wrapping), makes Youtube's HTML5 testpage
  happy and allows higher-framerate playback
· removed deprecated (gstreamer) / never used (nspr, nss, ...) dependencies
  · Pale Moon bundles specific versions of various libraries, compiling with
    the system's versions of those is not the default, not recommended and
    not supported with official branding
This commit is contained in:
OPNA2608 2019-07-15 10:19:07 +02:00
parent ab0b3e5573
commit 464b16c4b1
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/networking/browsers/palemoon/default.nix
View File

@ -1,14 +1,17 @@
{ stdenv, fetchFromGitHub, makeDesktopItem { stdenv, fetchFromGitHub, makeDesktopItem
, pkgconfig, autoconf213, alsaLib, bzip2, cairo , pkgconfig, autoconf213, alsaLib, bzip2, cairo
, dbus, dbus-glib, file, fontconfig, freetype , dbus, dbus-glib, ffmpeg, file, fontconfig, freetype
, gnome2, gnum4, gstreamer, gst-plugins-base, gst_all_1 , gnome2, gnum4, gtk2, hunspell, libevent, libjpeg
, gtk2, hunspell, icu, libevent, libjpeg, libnotify , libnotify, libstartup_notification, makeWrapper
, libstartup_notification, libvpx, makeWrapper, libGLU_combined , libGLU_combined, perl, python, libpulseaudio
, nspr, nss, pango, perl, python, libpulseaudio, sqlite
, unzip, xorg, wget, which, yasm, zip, zlib , unzip, xorg, wget, which, yasm, zip, zlib
}: }:
stdenv.mkDerivation rec { let
libPath = stdenv.lib.makeLibraryPath [ ffmpeg ];
in stdenv.mkDerivation rec {
pname = "palemoon"; pname = "palemoon";
version = "28.6.0.1"; version = "28.6.0.1";
@ -39,11 +42,10 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib bzip2 cairo dbus dbus-glib file fontconfig freetype alsaLib bzip2 cairo dbus dbus-glib ffmpeg file fontconfig freetype
gnome2.GConf gnum4 gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2 gnome2.GConf gnum4 gtk2 hunspell libevent libjpeg libnotify
hunspell icu libevent libjpeg libnotify libstartup_notification libstartup_notification makeWrapper libGLU_combined perl
libvpx makeWrapper libGLU_combined nspr nss pango perl pkgconfig python pkgconfig python libpulseaudio unzip wget which yasm zip zlib
libpulseaudio sqlite unzip wget which yasm zip zlib
] ++ (with xorg; [ ] ++ (with xorg; [
libX11 libXext libXft libXi libXrender libXScrnSaver libX11 libXext libXft libXi libXrender libXScrnSaver
libXt pixman xorgproto libXt pixman xorgproto
@ -107,6 +109,9 @@ stdenv.mkDerivation rec {
cp $src/application/palemoon/branding/official/default$n.png \ cp $src/application/palemoon/branding/official/default$n.png \
$out/share/icons/hicolor/$size/apps/palemoon.png $out/share/icons/hicolor/$size/apps/palemoon.png
done done
wrapProgram $out/lib/palemoon-${version}/palemoon \
--prefix LD_LIBRARY_PATH : "${libPath}"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {