kookie
/
nomicon
1
0
Fork 0
Code Issues Projects Releases 1 Activity

Merge pull request #169997 from armeenm/mapserver-python3

Browse Source 
mapserver: switch to python3
main
Artturi 2 years ago committed by GitHub
parent bb56c83212 b0c232895a
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 all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      pkgs/servers/mapserver/default.nix

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

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

Write Preview
Loading…
Cancel
Save