diff options
| author | Andreas <hamburger1984@gmail.com> | 2022-02-03 18:50:42 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-02-09 12:11:22 +0000 |
| commit | a1ce88d8a7f5bdf539b4080905957f69aa2b3c46 (patch) | |
| tree | 8cb0ce5c42b7ddf8bf3faa65afaf3a12dcdd9119 | |
| parent | Merge pull request #156397 from NixOS/backport-155457-to-release-21.11 (diff) | |
| download | nixpkgs-origin/backport-158472-to-release-21.11.tar.gz | |
Falkon: 3.1.0 -> 3.2.0origin/backport-158472-to-release-21.11
(cherry picked from commit 49ff7e72e48f8e3849f09f20991135219c12e147)
| -rw-r--r-- | pkgs/applications/networking/browsers/falkon/default.nix | 12 | ||||
| -rw-r--r-- | 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 5cda15efd003..d0477ad6be99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27890,7 +27890,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; |