From b0c232895a678da14daf91c365c8d75fb92e9c71 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Sat, 23 Apr 2022 13:54:58 -0500 Subject: [PATCH] mapserver: switch to python3 --- pkgs/servers/mapserver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mapserver/default.nix b/pkgs/servers/mapserver/default.nix index f8b0d8196fad..9ec9ad01bc87 100644 --- a/pkgs/servers/mapserver/default.nix +++ b/pkgs/servers/mapserver/default.nix @@ -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"