From 8d4fc1a65e33d75ad9b237050c166bf45886c31a Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 22 Jan 2017 17:14:14 +0100 Subject: [PATCH 1/2] qgis: 2.16.2 -> 2.18.3 --- pkgs/applications/gis/qgis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 680cf921ce26..d32aaba8468c 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.16.2"; + name = "qgis-2.18.3"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "0dll8klz0qfba4c1y7mp9k4y4azlay0sypvryicggllk1hna4w0n"; + sha256 = "155kz7fizhkmgc4lsmk1cph1zar03pdd8pjpmv81yyx1z0i4ygvl"; }; cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; From 632934862b61ed9bd761a14fc2633d1281e8652f Mon Sep 17 00:00:00 2001 From: Jean-Pierre PRUNARET Date: Sun, 22 Jan 2017 17:15:24 +0100 Subject: [PATCH 2/2] qgis: enableParallelBuilding --- pkgs/applications/gis/qgis/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index d32aaba8468c..a4d0d21ef40d 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; - # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory - #enableParallelBuilding = true; + enableParallelBuilding = true; # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process.