Vivaldi overlay for v6.9
Some checks failed
Build / nix-build (native-aarch64, varda) (push) Successful in 2m31s
Build / nix-build (native-x86_64, gandalf) (push) Has been cancelled
Build / nix-build (native-x86_64, telchar) (push) Has been cancelled
Build / nix-build (native-x86_64, telperion) (push) Has been cancelled
Build / Nix Build Successful (push) Has been cancelled
Some checks failed
Build / nix-build (native-aarch64, varda) (push) Successful in 2m31s
Build / nix-build (native-x86_64, gandalf) (push) Has been cancelled
Build / nix-build (native-x86_64, telchar) (push) Has been cancelled
Build / nix-build (native-x86_64, telperion) (push) Has been cancelled
Build / Nix Build Successful (push) Has been cancelled
This commit is contained in:
parent
f983137f11
commit
3a1eb9d320
5 changed files with 236 additions and 0 deletions
|
@ -2,6 +2,12 @@
|
||||||
let
|
let
|
||||||
inherit (inputs.nixpkgs) lib;
|
inherit (inputs.nixpkgs) lib;
|
||||||
termiusOverlay = import ./termius { };
|
termiusOverlay = import ./termius { };
|
||||||
|
# vivaldiOverlay = import ./vivaldi { };
|
||||||
|
|
||||||
|
vivaldiOverlay = self: super: {
|
||||||
|
vivaldi = super.callPackage ./vivaldi { };
|
||||||
|
};
|
||||||
|
|
||||||
talosctlOverlay = self: super: {
|
talosctlOverlay = self: super: {
|
||||||
talosctl = super.callPackage ./talosctl/talosctl-custom.nix { };
|
talosctl = super.callPackage ./talosctl/talosctl-custom.nix { };
|
||||||
};
|
};
|
||||||
|
@ -13,6 +19,7 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nur = inputs.nur.overlay;
|
nur = inputs.nur.overlay;
|
||||||
|
vivaldi = vivaldiOverlay;
|
||||||
# termius = termiusOverlay;
|
# termius = termiusOverlay;
|
||||||
# talosctl = talosctlOverlay;
|
# talosctl = talosctlOverlay;
|
||||||
|
|
||||||
|
|
135
nixos/overlays/vivaldi/default.nix
Normal file
135
nixos/overlays/vivaldi/default.nix
Normal file
|
@ -0,0 +1,135 @@
|
||||||
|
{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence
|
||||||
|
, libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
|
||||||
|
, alsa-lib, dbus, cups, libexif, ffmpeg, systemd, libva, libGL
|
||||||
|
, freetype, fontconfig, libXft, libXrender, libxcb, expat
|
||||||
|
, libuuid
|
||||||
|
, libxml2
|
||||||
|
, glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core
|
||||||
|
, qt5
|
||||||
|
, libdrm, mesa
|
||||||
|
, vulkan-loader
|
||||||
|
, nss, nspr
|
||||||
|
, patchelf, makeWrapper
|
||||||
|
, wayland, pipewire
|
||||||
|
, isSnapshot ? false
|
||||||
|
, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
|
||||||
|
, enableWidevine ? false, widevine-cdm ? null
|
||||||
|
, commandLineArgs ? ""
|
||||||
|
, pulseSupport ? stdenv.isLinux, libpulseaudio
|
||||||
|
, kerberosSupport ? true, libkrb5
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
branch = if isSnapshot then "snapshot" else "stable";
|
||||||
|
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
||||||
|
in stdenv.mkDerivation rec {
|
||||||
|
pname = "vivaldi";
|
||||||
|
version = "6.9.3447.37";
|
||||||
|
|
||||||
|
suffix = {
|
||||||
|
aarch64-linux = "arm64";
|
||||||
|
x86_64-linux = "amd64";
|
||||||
|
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
|
||||||
|
hash = {
|
||||||
|
aarch64-linux = "sha256-kYTnWad/jrJt9z+AhjXzHYxVSIwIIO3RKD7szuPEg2s=";
|
||||||
|
x86_64-linux = "sha256-+h7SHci8gZ+epKFHD0PiXyME2xT+loD2KXpJGFCfIFg=";
|
||||||
|
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||||
|
};
|
||||||
|
|
||||||
|
unpackPhase = ''
|
||||||
|
ar vx $src
|
||||||
|
tar -xvf data.tar.xz
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [ patchelf makeWrapper ];
|
||||||
|
|
||||||
|
dontWrapQtApps = true;
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence
|
||||||
|
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
|
||||||
|
atk at-spi2-atk at-spi2-core alsa-lib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd libva
|
||||||
|
qt5.qtbase
|
||||||
|
freetype fontconfig libXrender libuuid expat glib nss nspr libGL
|
||||||
|
libxml2 pango cairo
|
||||||
|
libdrm mesa vulkan-loader
|
||||||
|
wayland pipewire
|
||||||
|
] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs
|
||||||
|
++ lib.optional pulseSupport libpulseaudio
|
||||||
|
++ lib.optional kerberosSupport libkrb5;
|
||||||
|
|
||||||
|
libPath = lib.makeLibraryPath buildInputs
|
||||||
|
+ lib.optionalString (stdenv.is64bit)
|
||||||
|
(":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs)
|
||||||
|
+ ":$out/opt/${vivaldiName}/lib";
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
runHook preBuild
|
||||||
|
echo "Patching Vivaldi binaries"
|
||||||
|
for f in chrome_crashpad_handler vivaldi-bin vivaldi-sandbox ; do
|
||||||
|
patchelf \
|
||||||
|
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||||
|
--set-rpath "${libPath}" \
|
||||||
|
opt/${vivaldiName}/$f
|
||||||
|
done
|
||||||
|
|
||||||
|
for f in libGLESv2.so libqt5_shim.so ; do
|
||||||
|
patchelf --set-rpath "${libPath}" opt/${vivaldiName}/$f
|
||||||
|
done
|
||||||
|
'' + lib.optionalString proprietaryCodecs ''
|
||||||
|
ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/${vivaldiName}/libffmpeg.so.''${version%\.*\.*}
|
||||||
|
'' + ''
|
||||||
|
echo "Finished patching Vivaldi binaries"
|
||||||
|
runHook postBuild
|
||||||
|
'';
|
||||||
|
|
||||||
|
dontPatchELF = true;
|
||||||
|
dontStrip = true;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
mkdir -p "$out"
|
||||||
|
cp -r opt "$out"
|
||||||
|
mkdir "$out/bin"
|
||||||
|
ln -s "$out/opt/${vivaldiName}/${vivaldiName}" "$out/bin/vivaldi"
|
||||||
|
mkdir -p "$out/share"
|
||||||
|
cp -r usr/share/{applications,xfce4} "$out"/share
|
||||||
|
substituteInPlace "$out"/share/applications/*.desktop \
|
||||||
|
--replace /usr/bin/${vivaldiName} "$out"/bin/vivaldi
|
||||||
|
substituteInPlace "$out"/share/applications/*.desktop \
|
||||||
|
--replace vivaldi-stable vivaldi
|
||||||
|
local d
|
||||||
|
for d in 16 22 24 32 48 64 128 256; do
|
||||||
|
mkdir -p "$out"/share/icons/hicolor/''${d}x''${d}/apps
|
||||||
|
ln -s \
|
||||||
|
"$out"/opt/${vivaldiName}/product_logo_''${d}.png \
|
||||||
|
"$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png
|
||||||
|
done
|
||||||
|
wrapProgram "$out/bin/vivaldi" \
|
||||||
|
--add-flags ${lib.escapeShellArg commandLineArgs} \
|
||||||
|
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||||
|
--set-default FONTCONFIG_FILE "${fontconfig.out}/etc/fonts/fonts.conf" \
|
||||||
|
--set-default FONTCONFIG_PATH "${fontconfig.out}/etc/fonts" \
|
||||||
|
--suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
|
||||||
|
${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}
|
||||||
|
'' + lib.optionalString enableWidevine ''
|
||||||
|
ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm
|
||||||
|
'' + ''
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru.updateScript = ./update-vivaldi.sh;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Browser for our Friends, powerful and personal";
|
||||||
|
homepage = "https://vivaldi.com";
|
||||||
|
license = licenses.unfree;
|
||||||
|
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||||
|
mainProgram = "vivaldi";
|
||||||
|
maintainers = with maintainers; [ otwieracz badmutex ];
|
||||||
|
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||||
|
};
|
||||||
|
}
|
32
nixos/overlays/vivaldi/ffmpeg-codecs.nix
Normal file
32
nixos/overlays/vivaldi/ffmpeg-codecs.nix
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
{ squashfsTools, fetchurl, lib, stdenv }:
|
||||||
|
|
||||||
|
# This derivation roughly follows the update-ffmpeg script that ships with the official Vivaldi
|
||||||
|
# downloads at https://vivaldi.com/download/
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "chromium-codecs-ffmpeg-extra";
|
||||||
|
version = "115541";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "https://api.snapcraft.io/api/v1/snaps/download/XXzVIXswXKHqlUATPqGCj2w2l7BxosS8_41.snap";
|
||||||
|
hash = "sha256-a1peHhku+OaGvPyChvLdh6/7zT+v8OHNwt60QUq7VvU=";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = [ squashfsTools ];
|
||||||
|
|
||||||
|
unpackPhase = ''
|
||||||
|
unsquashfs -dest . $src
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
install -vD chromium-ffmpeg-${version}/chromium-ffmpeg/libffmpeg.so $out/lib/libffmpeg.so
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Additional support for proprietary codecs for Vivaldi";
|
||||||
|
homepage = "https://ffmpeg.org/";
|
||||||
|
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||||
|
license = licenses.lgpl21;
|
||||||
|
maintainers = with maintainers; [ betaboon cawilliamson fptje ];
|
||||||
|
platforms = [ "x86_64-linux" ];
|
||||||
|
};
|
||||||
|
}
|
15
nixos/overlays/vivaldi/update-vivaldi.sh
Normal file
15
nixos/overlays/vivaldi/update-vivaldi.sh
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
#!/usr/bin/env nix-shell
|
||||||
|
#!nix-shell -i bash -p curl common-updater-scripts
|
||||||
|
|
||||||
|
set -eu -o pipefail
|
||||||
|
|
||||||
|
version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p')
|
||||||
|
|
||||||
|
update_hash() {
|
||||||
|
url="https://downloads.vivaldi.com/stable/vivaldi-stable_$version-1_$2.deb"
|
||||||
|
hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "$url"))
|
||||||
|
update-source-version vivaldi "$version" "$hash" --system=$1 --ignore-same-version
|
||||||
|
}
|
||||||
|
|
||||||
|
update_hash aarch64-linux arm64
|
||||||
|
update_hash x86_64-linux amd64
|
47
nixos/overlays/vivaldi/update.sh
Normal file
47
nixos/overlays/vivaldi/update.sh
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
#!/usr/bin/env nix-shell
|
||||||
|
#!nix-shell -i bash -p libarchive curl common-updater-scripts
|
||||||
|
|
||||||
|
set -eu -o pipefail
|
||||||
|
|
||||||
|
cd "$(dirname "${BASH_SOURCE[0]}")"
|
||||||
|
root=../../../../..
|
||||||
|
export NIXPKGS_ALLOW_UNFREE=1
|
||||||
|
|
||||||
|
version() {
|
||||||
|
(cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"')
|
||||||
|
}
|
||||||
|
|
||||||
|
vivaldi_version_old=$(version vivaldi)
|
||||||
|
vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-1_amd64\.deb.*/\1/p')
|
||||||
|
|
||||||
|
if [[ ! "$vivaldi_version" = "$vivaldi_version_old" ]]; then
|
||||||
|
echo "vivaldi is not up-to-date, not updating codecs"
|
||||||
|
(cd "$root" && nix-shell maintainers/scripts/update.nix --argstr package vivaldi)
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "vivaldi is up-to-date, updating codecs"
|
||||||
|
|
||||||
|
# Download vivaldi and save file path.
|
||||||
|
url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}-1_amd64.deb"
|
||||||
|
mapfile -t prefetch < <(nix-prefetch-url --print-path "$url")
|
||||||
|
path=${prefetch[1]}
|
||||||
|
|
||||||
|
nixpkgs="$(git rev-parse --show-toplevel)"
|
||||||
|
default_nix="$nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix"
|
||||||
|
ffmpeg_nix="$nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix"
|
||||||
|
|
||||||
|
# Check vivaldi-ffmpeg-codecs version.
|
||||||
|
chromium_version_old=$(version vivaldi-ffmpeg-codecs)
|
||||||
|
ffmpeg_update_script=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/update-ffmpeg)
|
||||||
|
chromium_version=$(sed -rne 's/^FFMPEG_VERSION_DEB\=([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*/\1/p' <<< $ffmpeg_update_script)
|
||||||
|
download_subdir=$(sed -rne 's/.*FFMPEG_URL_DEB\=https:\/\/launchpadlibrarian\.net\/([0-9]+)\/.*_amd64\.deb/\1/p' <<< $ffmpeg_update_script)
|
||||||
|
|
||||||
|
if [[ "$chromium_version" != "$chromium_version_old" ]]; then
|
||||||
|
# replace the download prefix
|
||||||
|
sed -i $ffmpeg_nix -e "s/\(https:\/\/launchpadlibrarian\.net\/\)[0-9]\+/\1$download_subdir/g"
|
||||||
|
(cd "$root" && update-source-version vivaldi-ffmpeg-codecs "$chromium_version")
|
||||||
|
|
||||||
|
git add "${ffmpeg_nix}"
|
||||||
|
git commit -m "vivaldi-ffmpeg-codecs: $chromium_version_old -> $chromium_version"
|
||||||
|
fi
|
Loading…
Reference in a new issue