From b2a14fc0e4afe6b9b781bfa25d77b3600e8202dc Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Sat, 26 Aug 2023 15:12:58 +0200 Subject: qgis: disable building tests No tests are currently executed during the build process. Disable building them to save significant amount of time and resources. --- pkgs/applications/gis/qgis/unwrapped.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index f388284240bf0..46fe2e333e653 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -152,6 +152,7 @@ in mkDerivation rec { cmakeFlags = [ "-DWITH_3D=True" "-DWITH_PDAL=TRUE" + "-DENABLE_TESTS=False" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass (let gmajor = lib.versions.major grass.version; -- cgit 1.4.1 From 09f9749a096b4b7978445bcaf519017268a8ac69 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Sat, 26 Aug 2023 19:08:59 +0200 Subject: qgis: alphabetical sorting of dependencies --- pkgs/applications/gis/qgis/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index b3220f8d7081d..8fa7338c6eaff 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,8 +1,11 @@ -{ lib, makeWrapper, symlinkJoin +{ lib +, makeWrapper +, symlinkJoin + , extraPythonPackages ? (ps: [ ]) + , libsForQt5 }: -with lib; let qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix { }; in symlinkJoin rec { @@ -12,7 +15,10 @@ in symlinkJoin rec { paths = [ qgis-unwrapped ]; - nativeBuildInputs = [ makeWrapper qgis-unwrapped.py.pkgs.wrapPython ]; + nativeBuildInputs = [ + makeWrapper + qgis-unwrapped.py.pkgs.wrapPython + ]; # extend to add to the python environment of QGIS without rebuilding QGIS application. pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.py.pkgs); -- cgit 1.4.1