Unverified Commit e1a811af authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

Merge pull request #273872 from rhysmdnz/edge-120 

microsoft-edge: 119.0.2151.72 -> 120.0.2210.61
parents f459921f c2e9041e

pkgs/applications/networking/browsers/microsoft-edge/browser.nix

+4 −11
Original line number Diff line number Diff line
@@ -94,9 +94,6 @@ stdenv.mkDerivation rec { 
      libGLESv2 = lib.makeLibraryPath [

        xorg.libX11 xorg.libXext xorg.libxcb wayland

      ];

      libsmartscreenn = lib.makeLibraryPath [

        libuuid

      ];

      liboneauth = lib.makeLibraryPath [

        libuuid xorg.libX11

      ];
@@ -115,11 +112,6 @@ stdenv.mkDerivation rec { 
      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

      opt/microsoft/${shortName}/msedge_crashpad_handler



    patchelf \

      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

      --set-rpath "${libPath.naclHelper}" \

      opt/microsoft/${shortName}/nacl_helper



    patchelf \

      --set-rpath "${libPath.libwidevinecdm}" \

      opt/microsoft/${shortName}/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
@@ -131,10 +123,11 @@ stdenv.mkDerivation rec { 
    patchelf \

      --set-rpath "${libPath.liboneauth}" \

      opt/microsoft/${shortName}/liboneauth.so

  '' + lib.optionalString (lib.versionOlder version "120") ''

  '' + lib.optionalString (lib.versionOlder version "121") ''

    patchelf \

      --set-rpath "${libPath.libsmartscreenn}" \

      opt/microsoft/${shortName}/libsmartscreenn.so

      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

      --set-rpath "${libPath.naclHelper}" \

      opt/microsoft/${shortName}/nacl_helper

  '';



  installPhase = ''

pkgs/applications/networking/browsers/microsoft-edge/default.nix

+6 −6
Original line number Diff line number Diff line 
{

  stable = import ./browser.nix {

    channel = "stable";

    version = "119.0.2151.72";

    version = "120.0.2210.77";

    revision = "1";

    hash = "sha256-thBx/+6thNXXKppA11IOG5EiMx7pA9FA3vSkwa9+F0o=";

    hash = "sha256-mSIx/aYutmA/hGycNapvm8/BnADtXA6NRlMmns+yM5k=";

  };

  beta = import ./browser.nix {

    channel = "beta";

    version = "120.0.2210.22";

    version = "121.0.2277.4";

    revision = "1";

    hash = "sha256-GayVVZbtGLQmmXu+k4wdsD+rPwGiSPHnQwzVYyKWhHM=";

    hash = "sha256-Qn0H5JUMZUASqfaJfM1cpKj9E6XHjArvZ3jE+GpREOs=";

  };

  dev = import ./browser.nix {

    channel = "dev";

    version = "121.0.2220.3";

    version = "121.0.2277.4";

    revision = "1";

    hash = "sha256-M3r+SLp3lQ7oWDYoM7aNZDC5wbMxFZggsu0Iuyyw/cw=";

    hash = "sha256-41hOoZANy5hWrHAzxZGLX69apNMoAn7PiarWl6wicPA=";

  };

}