diff options
| author | Lukas Werling <lukas.werling@gmail.com> | 2017-06-25 14:00:05 +0200 |
|---|---|---|
| committer | Lukas Werling <lukas.werling@gmail.com> | 2017-07-25 14:25:09 +0200 |
| commit | d6f3cfecfbd442a1e1d27c444a47464c10939916 (patch) | |
| tree | 26445110779e1da1eda7cd2054f654585513210d /pkgs/applications/networking/browsers/vivaldi/default.nix | |
| parent | cb9cb34c23caba6bc678bd975aedaa461d906ef2 (diff) | |
| download | nixlib-d6f3cfecfbd442a1e1d27c444a47464c10939916.tar nixlib-d6f3cfecfbd442a1e1d27c444a47464c10939916.tar.gz nixlib-d6f3cfecfbd442a1e1d27c444a47464c10939916.tar.bz2 nixlib-d6f3cfecfbd442a1e1d27c444a47464c10939916.tar.lz nixlib-d6f3cfecfbd442a1e1d27c444a47464c10939916.tar.xz nixlib-d6f3cfecfbd442a1e1d27c444a47464c10939916.tar.zst nixlib-d6f3cfecfbd442a1e1d27c444a47464c10939916.zip | |
vivaldi: add proprietaryCodecs option
Fix #26413
Diffstat (limited to 'pkgs/applications/networking/browsers/vivaldi/default.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/vivaldi/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 06dd6ec3b6b2..c3edc0f4d618 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -7,6 +7,7 @@ , glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3 , nss, nspr , patchelf +, proprietaryCodecs ? true, vivaldi-ffmpeg-codecs ? null }: stdenv.mkDerivation rec { @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf - ]; + ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; libPath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.is64bit) @@ -45,6 +46,10 @@ stdenv.mkDerivation rec { --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ opt/vivaldi/vivaldi-bin + '' + stdenv.lib.optionalString proprietaryCodecs '' + sed -i '/^VIVALDI_FFMPEG_FOUND/ a \ + checkffmpeg "${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so"' opt/vivaldi/vivaldi + '' + '' echo "Finished patching Vivaldi binaries" ''; |