mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 13:08:39 +03:00
qgis: patch for compatibility with cmake 3.12 (#45880)
This commit is contained in:
parent
12b5435198
commit
90464f6049
@ -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
|
, qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper
|
||||||
, qjson, qca2, txt2tags, openssl, darwin, pkgconfig
|
, qjson, qca2, txt2tags, openssl, darwin, pkgconfig
|
||||||
, withGrass ? true, grass, IOKit, ApplicationServices
|
, withGrass ? true, grass, IOKit, ApplicationServices
|
||||||
@ -37,6 +37,14 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "00b3a2hfn3i7bdx7x96vz2nj0976vpkhid4ss7n8c33fdvw3k82a";
|
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
|
# CMAKE_FIND_FRAMEWORK=never stops the installer choosing system
|
||||||
# installed frameworks
|
# installed frameworks
|
||||||
# QGIS_MACAPP_BUNDLE=0 stops the installer copying the Qt binaries into the
|
# QGIS_MACAPP_BUNDLE=0 stops the installer copying the Qt binaries into the
|
||||||
|
Loading…
Reference in New Issue
Block a user