diff --git a/packages/helium-browser/package.nix b/packages/helium-browser/package.nix index 663fe20..3053a6a 100644 --- a/packages/helium-browser/package.nix +++ b/packages/helium-browser/package.nix @@ -7,6 +7,8 @@ autoPatchelfHook, makeWrapper, + helium-widevine, + # runtime dependencies xorg, libGL, @@ -104,6 +106,9 @@ stdenv.mkDerivation rec { cp -r ${xzName}/* $out/opt/helium/ chmod +x $out/opt/helium/chrome-wrapper $out/opt/helium/chrome + + cp -r ${helium-widevine}/share/helium/WidevineCdm $out/opt/helium/ + makeWrapper $out/opt/helium/chrome-wrapper $out/bin/helium-browser \ --chdir $out/opt/helium \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ diff --git a/packages/helium-browser/widevine-aarch64-linux.nix b/packages/helium-browser/widevine-aarch64-linux.nix index 94173c0..1ac999b 100644 --- a/packages/helium-browser/widevine-aarch64-linux.nix +++ b/packages/helium-browser/widevine-aarch64-linux.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "widevine-helium"; + pname = "helium-widevine"; version = "${finalAttrs.lacrosVersion}-${builtins.substring 0 7 finalAttrs.widevineInstaller.rev}"; lacrosVersion = "120.0.6098.0"; @@ -38,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { # Accoring to widevine-installer: "Hack because Chromium hardcodes a check for this right now..." postInstall = '' - install -vD manifest.json "$out/share/helium/WidevineCdm/manifest.json" - install -vD LICENSE.txt "$out/share/helium/WidevineCdm/License.txt" + mkdir -p "$out/share/helium/WidevineCdm/_platform_specific/linux_x64" + touch "$out/share/helium/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so" + install -vD manifest.json "$out/share/helium/WidevineCdm/manifest.json" + install -vD LICENSE.txt "$out/share/helium/WidevineCdm/License.txt" install -vD libwidevinecdm.so "$out/share/helium/WidevineCdm/_platform_specific/linux_arm64/libwidevinecdm.so" - mkdir -p "$out/share/helium/WidevineCdm/_platform_specific/linux_x64" - touch "$out/share/helium/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so" ''; meta = import ./widevine-meta.nix lib; diff --git a/packages/overlay.nix b/packages/overlay.nix index b6d6ceb..9dbb74b 100644 --- a/packages/overlay.nix +++ b/packages/overlay.nix @@ -5,7 +5,24 @@ final: prev: { else null; - helium-browser = prev.callPackage (builtins.path { path = ./helium-browser/package.nix; }) { }; + # helium-browser = + # prev.callPackage + # (builtins.path { + # path = ./helium-browser/package.nix; + # }) + # { + # helium-widevine = prev.callPackage (builtins.path { + # path = ./helium-browser/widevine-aarch64-linux.nix; + # }) { }; + # }; + + helium-browser = + let + helium-widevine = prev.callPackage ./helium-browser/widevine-aarch64-linux.nix { }; + in + prev.callPackage ./helium-browser/package.nix { + inherit helium-widevine; + }; strawberry-master = prev.callPackage (builtins.path { path = ./strawberry/package.nix;