Unverified Commit 60ffc2aa authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #249159 from ionutnechita/local/yandex-browser-update-2023Q3 

yandex-browser:  23.7.1.1215-1 -> 23.9.1.962-1
parents b644d97b 82d14369

pkgs/applications/networking/browsers/yandex-browser/default.nix

+37 −8
Original line number Diff line number Diff line
@@ -47,19 +47,42 @@ 
, at-spi2-atk

, at-spi2-core

, libqt5pas

, qt6

, vivaldi-ffmpeg-codecs

, edition ? "stable"

}:



stdenv.mkDerivation rec {

  pname = "yandex-browser";

  version = "23.7.1.1148-1";

let

  version = {

    corporate = "23.9.1.1016-1";

    beta = "23.9.1.1028-1";

    stable = "23.9.1.962-1";

  }.${edition};



  hash = {

    corporate = "sha256-A/MjphA6vefDzPmShpPbgjDTl4WnCiZWuHofy1Djrzc=";

    beta = "sha256-vnz1weMwR3V/mBNzrJ0iqnA/aifYTCucW+9kyy/0SnA=";

    stable = "sha256-VrDqFLvK7RdnV6Yt1DILu7mV1WFcilOH5+VKlCdpXjc=";

  }.${edition};



  app = {

    corporate = "";

    beta = "-beta";

    stable = "";

  }.${edition};



in stdenv.mkDerivation rec {

  pname = "yandex-browser-${edition}";

  inherit version;



  src = fetchurl {

    url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb";

    sha256 = "sha256-SJbuT2MnsXcqOSk4xCUokseDotjbWgAnvwnfNPF9zi4=";

    url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}/${pname}_${version}_amd64.deb";

    inherit hash;

  };



  nativeBuildInputs = [

    autoPatchelfHook

    qt6.wrapQtAppsHook

    wrapGAppsHook

  ];
@@ -108,6 +131,7 @@ stdenv.mkDerivation rec { 
    pango

    stdenv.cc.cc.lib

    libqt5pas

    qt6.qtbase

  ];



  unpackPhase = ''
@@ -118,15 +142,20 @@ stdenv.mkDerivation rec { 


  installPhase = ''

    cp $TMP/ya/{usr/share,opt} $out/ -R

    substituteInPlace $out/share/applications/yandex-browser-beta.desktop --replace /usr/ $out/

    ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser

    ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser-beta

    cp $out/share/applications/yandex-browser${app}.desktop $out/share/applications/${pname}.desktop || true

    rm -f $out/share/applications/yandex-browser.desktop

    substituteInPlace $out/share/applications/${pname}.desktop --replace /usr/ $out/

    substituteInPlace $out/share/menu/yandex-browser${app}.menu --replace /opt/ $out/opt/

    substituteInPlace $out/share/gnome-control-center/default-apps/yandex-browser${app}.xml --replace /opt/ $out/opt/

    ln -sf ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so $out/opt/yandex/browser${app}/libffmpeg.so

    ln -sf $out/opt/yandex/browser${app}/yandex-browser${app} $out/bin/${pname}

  '';



  runtimeDependencies = map lib.getLib [

    libpulseaudio

    curl

    systemd

    vivaldi-ffmpeg-codecs

  ] ++ buildInputs;



  meta = with lib; {

pkgs/top-level/all-packages.nix

+4 −0
Original line number Diff line number Diff line
@@ -41538,6 +41538,10 @@ with pkgs; 














  yandex-browser = callPackage ../applications/networking/browsers/yandex-browser { };



























  yandex-browser-beta = yandex-browser.override { edition = "beta"; };

























  yandex-browser-corporate = yandex-browser.override { edition = "corporate"; };



























  yandex-disk = callPackage ../tools/filesystems/yandex-disk { };





























  yara = callPackage ../tools/security/yara { };