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

vivaldi: add proprietaryCodecs option

Browse Source 
Fix #26413
This commit is contained in:
Lukas Werling 2017-06-25 14:00:05 +02:00
parent cb9cb34c23
commit d6f3cfecfb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -7,6 +7,7 @@
, glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3 , glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3
, nss, nspr , nss, nspr
, patchelf , patchelf
, proprietaryCodecs ? true, vivaldi-ffmpeg-codecs ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
freetype fontconfig libXrender libuuid expat glib nss nspr freetype fontconfig libXrender libuuid expat glib nss nspr
gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
]; ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
libPath = stdenv.lib.makeLibraryPath buildInputs libPath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.is64bit) + stdenv.lib.optionalString (stdenv.is64bit)
@ -45,6 +46,10 @@ stdenv.mkDerivation rec {
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libPath}" \ --set-rpath "${libPath}" \
opt/vivaldi/vivaldi-bin 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" echo "Finished patching Vivaldi binaries"
''; '';