From fae4895e11885ca16bf22cbbd17f990920ed24e5 Mon Sep 17 00:00:00 2001 From: Andreas Date: Thu, 3 Feb 2022 18:50:42 +0100 Subject: [PATCH] Falkon: 3.1.0 -> 3.2.0 --- .../networking/browsers/falkon/default.nix | 12 ++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index f39ae2f16691..6b525fbca9f7 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -8,23 +8,15 @@ mkDerivation rec { pname = "falkon"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "KDE"; repo = "falkon"; rev = "v${version}"; - sha256 = "1w64slh9wpcfi4v7ds9wci1zvwh0dh787ndpi6hd4kmdgnswvsw7"; + sha256 = "sha256-esi9YWd1PtQpDBhI1NtWEjZIoMoNUpAF+kQad67mLzE="; }; - patches = [ - # fixes build with qt5 5.14 - (fetchpatch { - url = "https://github.com/KDE/falkon/commit/bbde5c6955c43bc744ed2c4024598495de908f2a.diff"; - sha256 = "0f7qcddvvdnij3di0acg7jwvwfwyd0xizlav4wccclbj8x7qp5ld"; - }) - ]; - preConfigure = '' export NONBLOCK_JS_DIALOGS=true export KDE_INTEGRATION=true diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 454bbf667807..4b063b21c37a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28356,7 +28356,7 @@ with pkgs; quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; - falkon = libsForQt514.callPackage ../applications/networking/browsers/falkon { }; + falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; quodlibet = callPackage ../applications/audio/quodlibet { keybinder3 = null;