diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2018-09-01 17:52:33 +0900 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-01 10:52:33 +0200 |
| commit | 90464f60490b965b482b82cd6b747bb4577c2786 (patch) | |
| tree | 02e9afe8de21330a5984cdd0723b34eaf22a9f7a | |
| parent | 12b5435198004eb3ebaccf34d7831ec7652845e9 (diff) | |
| download | nixlib-90464f60490b965b482b82cd6b747bb4577c2786.tar nixlib-90464f60490b965b482b82cd6b747bb4577c2786.tar.gz nixlib-90464f60490b965b482b82cd6b747bb4577c2786.tar.bz2 nixlib-90464f60490b965b482b82cd6b747bb4577c2786.tar.lz nixlib-90464f60490b965b482b82cd6b747bb4577c2786.tar.xz nixlib-90464f60490b965b482b82cd6b747bb4577c2786.tar.zst nixlib-90464f60490b965b482b82cd6b747bb4577c2786.zip | |
qgis: patch for compatibility with cmake 3.12 (#45880)
| -rw-r--r-- | pkgs/applications/gis/qgis/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 8f06a659f60c..744aef20fda6 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl +{ stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper , qjson, qca2, txt2tags, openssl, darwin, pkgconfig , withGrass ? true, grass, IOKit, ApplicationServices @@ -37,6 +37,14 @@ stdenv.mkDerivation rec { sha256 = "00b3a2hfn3i7bdx7x96vz2nj0976vpkhid4ss7n8c33fdvw3k82a"; }; + patches = [ + # https://github.com/qgis/QGIS/pull/7765 + (fetchpatch { + url = "https://github.com/qgis/QGIS/commit/6b61ef361a77f057dc29eb07463007bd9012b253.patch"; + sha256 = "1xibcahm18n7nxff1xvwwzjf505hvhiw5dk12is7aclv49h0rdf7"; + }) + ]; + # CMAKE_FIND_FRAMEWORK=never stops the installer choosing system # installed frameworks # QGIS_MACAPP_BUNDLE=0 stops the installer copying the Qt binaries into the |