dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #169997 from armeenm/mapserver-python3

Browse Source 
mapserver: switch to python3
This commit is contained in:
Artturi 2022-05-06 07:18:39 +03:00 committed by GitHub
commit c8a723fb01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/mapserver/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, cairo, curl, fcgi, freetype, fribidi, gdal, geos, giflib, harfbuzz
, libjpeg, libpng, librsvg, libxml2, postgresql, proj, protobufc, zlib
, withPython ? true, swig, python2
, withPython ? true, swig, python3
}:
stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkg-config
] ++ lib.optional withPython swig;
] ++ lib.optional withPython [ swig python3.pkgs.setuptools ];
buildInputs = [
cairo
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
proj
protobufc
zlib
] ++ lib.optional withPython python2;
] ++ lib.optional withPython python3;
cmakeFlags = [
"-DWITH_KML=ON"