diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-12-07 14:04:47 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-12-07 14:04:47 +0100 |
commit | ba08e4e99b00a6916c4360de7288a7bfcef85328 (patch) | |
tree | 347c8b6ad50fcaafc08e50f1307a861378650440 /nixpkgs/pkgs/applications/networking/browsers/opera/default.nix | |
parent | 190fd93d11701ad81af757be6260df9635bdb41a (diff) | |
parent | 2c7f3c0fb7c08a0814627611d9d7d45ab6d75335 (diff) | |
download | nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.gz nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.bz2 nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.lz nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.xz nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.tar.zst nixlib-ba08e4e99b00a6916c4360de7288a7bfcef85328.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/browsers/opera/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/opera/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix index 02e000cf4e65..785c03755c13 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix @@ -41,7 +41,7 @@ , at-spi2-core , autoPatchelfHook , wrapGAppsHook -, qt5 +, qt6 , proprietaryCodecs ? false , vivaldi-ffmpeg-codecs }: @@ -51,11 +51,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "100.0.4815.47"; + version = "105.0.4970.21"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-746imLXqxzf9zK2QEVRuWkLA6m+HHXBYZFUwTD0HEVc="; + hash = "sha256-fgbR7qAWKaZgxMeMo1/le8g1/zSoTl+5iIJeKl1Rc3Y="; }; unpackPhase = "dpkg-deb -x $src ."; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { dpkg autoPatchelfHook wrapGAppsHook - qt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ @@ -103,6 +103,7 @@ stdenv.mkDerivation rec { nss pango stdenv.cc.cc.lib + qt6.qtbase ]; runtimeDependencies = [ @@ -128,6 +129,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r usr $out cp -r usr/share $out/share + + # we already using QT6, autopatchelf wants to patch this as well + rm $out/usr/lib/x86_64-linux-gnu/opera/libqt5_shim.so ln -s $out/usr/bin/opera $out/bin/opera ''; |