Revert "proj: 7.2.1 -> 8.0.1" + patch the test
This reverts commit 25b20757e8
and adds an upstream patch. There are API changes
https://proj.org/development/migration.html
and I couldn't make some of the other packages build,
so I decided to just patch the test instead (for now).
This commit is contained in:
parent
07b9fef470
commit
34a9c0daf5
|
@ -7,19 +7,28 @@
|
||||||
, libtiff
|
, libtiff
|
||||||
, curl
|
, curl
|
||||||
, gtest
|
, gtest
|
||||||
|
, fetchpatch
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "proj";
|
pname = "proj";
|
||||||
version = "8.0.1";
|
version = "7.2.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "OSGeo";
|
owner = "OSGeo";
|
||||||
repo = "PROJ";
|
repo = "PROJ";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-pgmv/mtqpKbgU1RuKtue7NAnMyXR1BwGJwoeA/MTrpY=";
|
sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch { # https://github.com/OSGeo/PROJ/issues/2557
|
||||||
|
name = "gie_self_tests-fail.diff"; # included in >= 8.0.1
|
||||||
|
url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";
|
||||||
|
sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = lib.optionalString (version == "7.2.1") ''
|
postPatch = lib.optionalString (version == "7.2.1") ''
|
||||||
substituteInPlace CMakeLists.txt \
|
substituteInPlace CMakeLists.txt \
|
||||||
--replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1"
|
--replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1"
|
||||||
|
|
Loading…
Reference in a new issue