tjh.dev
fork
Configure Feed
Select the types of activity you want to include in your feed.
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
fork
Configure Feed
Select the types of activity you want to include in your feed.
proj: 9.2.0 -> 9.2.1
Diff: https://github.com/OSGeo/PROJ/compare/9.2.0...9.2.1
Changelog: https://github.com/OSGeo/PROJ/blob/9.2.1/NEWS
+14
-32
+3
-3
pkgs/development/libraries/proj/default.nix
+3
-3
pkgs/development/libraries/proj/default.nix
···
17
17
18
18
stdenv.mkDerivation (finalAttrs: rec {
19
19
pname = "proj";
20
-
version = "9.2.0";
20
+
version = "9.2.1";
21
21
22
22
src = fetchFromGitHub {
23
23
owner = "OSGeo";
24
24
repo = "PROJ";
25
25
rev = version;
26
-
hash = "sha256-NC5H7ufIXit+PVDwNDhz5cv44fduTytsdmNOWyqDDYQ=";
26
+
hash = "sha256-cUnnJ9gOh65xBbfamfDkN7ajRdRLO5nUXRLeaBBMchg=";
27
27
};
28
28
29
29
patches = [
···
64
64
};
65
65
66
66
meta = with lib; {
67
-
changelog = "https://github.com/OSGeo/PROJ/blob/${src.rev}/docs/source/news.rst";
67
+
changelog = "https://github.com/OSGeo/PROJ/blob/${src.rev}/NEWS";
68
68
description = "Cartographic Projections Library";
69
69
homepage = "https://proj.org/";
70
70
license = licenses.mit;
+11
-29
pkgs/development/libraries/proj/only-add-curl-for-static-builds.patch
+11
-29
pkgs/development/libraries/proj/only-add-curl-for-static-builds.patch
···
1
-
From 831063f8206cab1ad3e90b204a1c3f8c87c3d5cc Mon Sep 17 00:00:00 2001
1
+
From 54b1dbc550b3daa2a7834a9bfd73a0c2f8aeba6a Mon Sep 17 00:00:00 2001
2
2
From: Even Rouault <even.rouault@spatialys.com>
3
3
Date: Tue, 5 Jul 2022 19:40:53 +0200
4
4
Subject: [PATCH] proj-config.cmake generation: only add find_dependency(CURL)
5
5
for static builds
6
6
7
7
---
8
-
cmake/project-config.cmake.in | 30 +++++++++++++++++-------------
9
-
1 file changed, 17 insertions(+), 13 deletions(-)
8
+
cmake/project-config.cmake.in | 12 ++++++++----
9
+
1 file changed, 8 insertions(+), 4 deletions(-)
10
10
11
11
diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
12
-
index 40dbaaa2..c1ecd601 100644
12
+
index 3f359668..db886396 100644
13
13
--- a/cmake/project-config.cmake.in
14
14
+++ b/cmake/project-config.cmake.in
15
-
@@ -15,20 +15,24 @@ include(CMakeFindDependencyMacro)
16
-
15
+
@@ -19,11 +19,15 @@ include(CMakeFindDependencyMacro)
16
+
# Cf https://gitlab.kitware.com/cmake/cmake/-/issues/17612
17
17
cmake_policy(PUSH)
18
18
cmake_policy(SET CMP0012 NEW)
19
19
-if("@ENABLE_TIFF@")
20
-
- find_dependency(TIFF)
20
+
- set(PROJ_CONFIG_FIND_TIFF_DEP ON)
21
21
+if(NOT "@BUILD_SHARED_LIBS@")
22
22
+ if("@ENABLE_TIFF@")
23
-
+ find_dependency(TIFF)
23
+
+ set(PROJ_CONFIG_FIND_TIFF_DEP ON)
24
24
+ endif()
25
25
endif()
26
26
-if("@CURL_ENABLED@")
27
-
- # Chainload CURL usage requirements
28
-
- find_dependency(CURL)
29
-
- # Target CURL::libcurl only defined since CMake 3.12
30
-
- if(NOT TARGET CURL::libcurl)
31
-
- add_library(CURL::libcurl INTERFACE IMPORTED)
32
-
- set_target_properties(CURL::libcurl PROPERTIES
33
-
- INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}"
34
-
- INTERFACE_LINK_LIBRARIES "${CURL_LIBRARIES}"
35
-
- )
36
-
- endif()
27
+
- set(PROJ_CONFIG_FIND_CURL_DEP ON)
37
28
+if(NOT "@BUILD_SHARED_LIBS@")
38
29
+ if("@CURL_ENABLED@")
39
-
+ # Chainload CURL usage requirements
40
-
+ find_dependency(CURL)
41
-
+ # Target CURL::libcurl only defined since CMake 3.12
42
-
+ if(NOT TARGET CURL::libcurl)
43
-
+ add_library(CURL::libcurl INTERFACE IMPORTED)
44
-
+ set_target_properties(CURL::libcurl PROPERTIES
45
-
+ INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}"
46
-
+ INTERFACE_LINK_LIBRARIES "${CURL_LIBRARIES}"
47
-
+ )
48
-
+ endif()
30
+
+ set(PROJ_CONFIG_FIND_CURL_DEP ON)
49
31
+ endif()
50
32
endif()
51
33
cmake_policy(POP)
52
34
53
35
--
54
-
2.39.2
36
+
2.41.0
55
37