diff options
| author | Rhys Davies <rhys@memes.nz> | 2023-12-13 13:34:45 +1300 |
|---|---|---|
| committer | Rhys Davies <rhys@memes.nz> | 2023-12-18 16:09:30 +1300 |
| commit | c2e9041e80e747a332f4233acc6d69034d3410b0 (patch) | |
| tree | 27fed66231a9ba581c4612a8c6a6f3f4c5782e57 /pkgs | |
| parent | c9945b177c01fb8df21efb70c2be34614f679254 (diff) | |
| download | nixlib-c2e9041e80e747a332f4233acc6d69034d3410b0.tar nixlib-c2e9041e80e747a332f4233acc6d69034d3410b0.tar.gz nixlib-c2e9041e80e747a332f4233acc6d69034d3410b0.tar.bz2 nixlib-c2e9041e80e747a332f4233acc6d69034d3410b0.tar.lz nixlib-c2e9041e80e747a332f4233acc6d69034d3410b0.tar.xz nixlib-c2e9041e80e747a332f4233acc6d69034d3410b0.tar.zst nixlib-c2e9041e80e747a332f4233acc6d69034d3410b0.zip | |
microsoft-edge: 119.0.2151.72 -> 120.0.2210.77
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/microsoft-edge/browser.nix | 15 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/microsoft-edge/default.nix | 12 |
2 files changed, 10 insertions, 17 deletions
diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index 12ef901bbcb3..9d3da97fff8c 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -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 ]; @@ -116,11 +113,6 @@ stdenv.mkDerivation rec { 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 = '' diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 51b3d6730862..d9dea8f312ec 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { 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="; }; } |