From 93111343dc30d9418008232ab970cbd33471346b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 8 Oct 2020 18:37:25 +0200 Subject: [PATCH] qgis: consistently use qt 5.14 --- pkgs/top-level/all-packages.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3b888ba238..bcaaff86b9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22878,7 +22878,18 @@ in qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; - qgis-unwrapped = libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix { + # Our 3.10 LTS cannot use a newer Qt (5.15) version because it requires qtwebkit + # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b + qgis-unwrapped = let + pkgs_ = pkgs.extend(_: prev: { + pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { + pkgs = oldAttrs.pkgs.extend(_: _: { + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; + }); + }); + }); + in pkgs_.libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix { withGrass = false; };