diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-08-30 23:55:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-30 23:55:35 +0200 |
| commit | ff813f83473ca06d600d69d7f6827568c8b8afca (patch) | |
| tree | 389b1717a74683e2c8c6d6d35efba07b3deb3099 /pkgs/applications/gis | |
| parent | 1f52d286b92d35b9654405aa3804297d8b03425b (diff) | |
| parent | 09f9749a096b4b7978445bcaf519017268a8ac69 (diff) | |
Merge pull request #251592 from imincik/qgis-dont-build-test
qgis: disable building tests
Diffstat (limited to 'pkgs/applications/gis')
| -rw-r--r-- | pkgs/applications/gis/qgis/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/gis/qgis/unwrapped.nix | 1 |
2 files changed, 10 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); 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; |