mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
Merge pull request #218192 from wegank/widevine-bump
widevine-cdm: 4.10.2449.0 -> 4.10.2557.0, merge with vivaldi-widevine
This commit is contained in:
commit
901f0c92f1
|
@ -1,18 +1,26 @@
|
|||
{ lib, stdenv, fetchzip
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "widevine-cdm";
|
||||
version = "4.10.2449.0";
|
||||
version = "4.10.2557.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip";
|
||||
sha256 = "sha256-f2kAkP+s3fB+krEZsiujEoI4oznkzSyaIB/CRJZWlXE=";
|
||||
hash = "sha256-XxTjuPjWy06SmHC6GaIVIp3zD76isCVATWwwdZljntE=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
install -vD libwidevinecdm.so $out/libwidevinecdm.so
|
||||
runHook preInstall
|
||||
|
||||
install -vD manifest.json $out/share/google/chrome/WidevineCdm/manifest.json
|
||||
install -vD LICENSE.txt $out/share/google/chrome/WidevineCdm/LICENSE.txt
|
||||
install -vD libwidevinecdm.so $out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -21,6 +29,6 @@ stdenv.mkDerivation rec {
|
|||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ jlamur ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -144,7 +144,7 @@ buildPythonApplication {
|
|||
--add-flags '--backend ${backend}'
|
||||
--set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}"
|
||||
${lib.optionalString (pipewireSupport && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''}
|
||||
${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/libwidevinecdm.so"''}
|
||||
${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''}
|
||||
)
|
||||
'';
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
, wayland, pipewire
|
||||
, isSnapshot ? false
|
||||
, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
|
||||
, enableWidevine ? false, vivaldi-widevine ? null
|
||||
, enableWidevine ? false, widevine-cdm ? null
|
||||
, commandLineArgs ? ""
|
||||
, pulseSupport ? stdenv.isLinux, libpulseaudio
|
||||
}:
|
||||
|
@ -95,7 +95,7 @@ in stdenv.mkDerivation rec {
|
|||
--suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
|
||||
${lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}
|
||||
'' + lib.optionalString enableWidevine ''
|
||||
ln -sf ${vivaldi-widevine}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm
|
||||
ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm
|
||||
'' + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
|
|
@ -1,28 +0,0 @@
|
|||
{ lib, stdenv, fetchzip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "widevine";
|
||||
version = "4.10.2449.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip";
|
||||
sha256 = "sha256-f2kAkP+s3fB+krEZsiujEoI4oznkzSyaIB/CRJZWlXE=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
install -vD manifest.json $out/share/google/chrome/WidevineCdm/manifest.json
|
||||
install -vD LICENSE.txt $out/share/google/chrome/WidevineCdm/LICENSE.txt
|
||||
install -vD libwidevinecdm.so $out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Widevine support for Vivaldi";
|
||||
homepage = "https://www.widevine.com";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ betaboon ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
|
@ -1625,6 +1625,7 @@ mapAliases ({
|
|||
virtmanager = virt-manager; # Added 2019-10-29
|
||||
virtmanager-qt = virt-manager-qt; # Added 2019-10-29
|
||||
virtviewer = throw "'virtviewer' has been renamed to/replaced by 'virt-viewer'"; # Converted to throw 2022-02-22
|
||||
vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25
|
||||
vkBasalt = vkbasalt; # Added 2022-11-22
|
||||
vnc2flv = throw "vnc2flv has been removed: abandoned by upstream"; # Added 2022-03-21
|
||||
vorbisTools = throw "'vorbisTools' has been renamed to/replaced by 'vorbis-tools'"; # Converted to throw 2022-02-22
|
||||
|
|
|
@ -32311,8 +32311,6 @@ with pkgs;
|
|||
|
||||
vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {};
|
||||
|
||||
vivaldi-widevine = callPackage ../applications/networking/browsers/vivaldi/widevine.nix { };
|
||||
|
||||
libopenmpt = callPackage ../development/libraries/audio/libopenmpt { };
|
||||
|
||||
libopenmpt-modplug = callPackage ../development/libraries/audio/libopenmpt-modplug { };
|
||||
|
|
Loading…
Reference in a new issue