diff options
author | OPNA2608 <christoph.neidahl@gmail.com> | 2019-07-15 10:19:07 +0200 |
---|---|---|
committer | OPNA2608 <christoph.neidahl@gmail.com> | 2019-07-15 10:19:07 +0200 |
commit | 464b16c4b187bc875aedfd1441f829e0b03fcd46 (patch) | |
tree | e793ca1159fd75ad7d300ea1e634c80de3903055 | |
parent | ab0b3e5573d30a6070770055ac9daa9c418683a5 (diff) | |
download | nixpkgs-464b16c4b187bc875aedfd1441f829e0b03fcd46.tar nixpkgs-464b16c4b187bc875aedfd1441f829e0b03fcd46.tar.gz nixpkgs-464b16c4b187bc875aedfd1441f829e0b03fcd46.tar.bz2 nixpkgs-464b16c4b187bc875aedfd1441f829e0b03fcd46.tar.lz nixpkgs-464b16c4b187bc875aedfd1441f829e0b03fcd46.tar.xz nixpkgs-464b16c4b187bc875aedfd1441f829e0b03fcd46.tar.zst nixpkgs-464b16c4b187bc875aedfd1441f829e0b03fcd46.zip |
palemoon: add ffmpeg, remove unused dependencies
· 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
-rw-r--r-- | pkgs/applications/networking/browsers/palemoon/default.nix | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 74d8ba8ea43..f85ca6e430b 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,14 +1,17 @@ { stdenv, fetchFromGitHub, makeDesktopItem , pkgconfig, autoconf213, alsaLib, bzip2, cairo -, dbus, dbus-glib, file, fontconfig, freetype -, gnome2, gnum4, gstreamer, gst-plugins-base, gst_all_1 -, gtk2, hunspell, icu, libevent, libjpeg, libnotify -, libstartup_notification, libvpx, makeWrapper, libGLU_combined -, nspr, nss, pango, perl, python, libpulseaudio, sqlite +, dbus, dbus-glib, ffmpeg, file, fontconfig, freetype +, gnome2, gnum4, gtk2, hunspell, libevent, libjpeg +, libnotify, libstartup_notification, makeWrapper +, libGLU_combined, perl, python, libpulseaudio , unzip, xorg, wget, which, yasm, zip, zlib }: -stdenv.mkDerivation rec { +let + + libPath = stdenv.lib.makeLibraryPath [ ffmpeg ]; + +in stdenv.mkDerivation rec { pname = "palemoon"; version = "28.6.0.1"; @@ -39,11 +42,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib bzip2 cairo dbus dbus-glib file fontconfig freetype - gnome2.GConf gnum4 gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2 - hunspell icu libevent libjpeg libnotify libstartup_notification - libvpx makeWrapper libGLU_combined nspr nss pango perl pkgconfig python - libpulseaudio sqlite unzip wget which yasm zip zlib + alsaLib bzip2 cairo dbus dbus-glib ffmpeg file fontconfig freetype + gnome2.GConf gnum4 gtk2 hunspell libevent libjpeg libnotify + libstartup_notification makeWrapper libGLU_combined perl + pkgconfig python libpulseaudio unzip wget which yasm zip zlib ] ++ (with xorg; [ libX11 libXext libXft libXi libXrender libXScrnSaver libXt pixman xorgproto @@ -107,6 +109,9 @@ stdenv.mkDerivation rec { cp $src/application/palemoon/branding/official/default$n.png \ $out/share/icons/hicolor/$size/apps/palemoon.png done + + wrapProgram $out/lib/palemoon-${version}/palemoon \ + --prefix LD_LIBRARY_PATH : "${libPath}" ''; meta = with stdenv.lib; { |