diff options
| author | hqurve <hqurve@outlook.com> | 2023-01-01 20:23:58 -0400 |
|---|---|---|
| committer | hqurve <hqurve@outlook.com> | 2023-01-02 10:10:02 -0400 |
| commit | bba45f07cede2b65ce4f49708cb362f6e1ec229f (patch) | |
| tree | 2afbbaf57a10a42d75fe033366b75f70dc49d8bb /pkgs/applications/gis | |
| parent | cc513677183892c157802f8579917263a08a49e0 (diff) | |
| download | nixpkgs-bba45f07cede2b65ce4f49708cb362f6e1ec229f.tar nixpkgs-bba45f07cede2b65ce4f49708cb362f6e1ec229f.tar.gz nixpkgs-bba45f07cede2b65ce4f49708cb362f6e1ec229f.tar.bz2 nixpkgs-bba45f07cede2b65ce4f49708cb362f6e1ec229f.tar.lz nixpkgs-bba45f07cede2b65ce4f49708cb362f6e1ec229f.tar.xz nixpkgs-bba45f07cede2b65ce4f49708cb362f6e1ec229f.tar.zst nixpkgs-bba45f07cede2b65ce4f49708cb362f6e1ec229f.zip | |
qgis, qgis-ltr: fix grass
Diffstat (limited to 'pkgs/applications/gis')
| -rw-r--r-- | pkgs/applications/gis/qgis/unwrapped-ltr.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/gis/qgis/unwrapped.nix | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 39720283057..5e35e56fe5f 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -134,7 +134,11 @@ in mkDerivation rec { "-DWITH_3D=True" "-DWITH_PDAL=TRUE" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + ++ lib.optional withGrass (let + gmajor = lib.versions.major grass.version; + gminor = lib.versions.minor grass.version; + in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" + ); dontWrapGApps = true; # wrapper params passed below diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index d8af7537569..929a40d6daa 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -134,7 +134,11 @@ in mkDerivation rec { "-DWITH_3D=True" "-DWITH_PDAL=TRUE" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + ++ lib.optional withGrass (let + gmajor = lib.versions.major grass.version; + gminor = lib.versions.minor grass.version; + in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" + ); dontWrapGApps = true; # wrapper params passed below |