pyrox.dev
Merge pull request #232340 from tomodachi94/update/poco/1.12.4
poco: 1.11.1 -> 1.12.4
authored by
Robert Scott
and committed by
GitHub
4babdb66
eea79d58
+7
pkgs/applications/radio/pothos/default.nix
+7
pkgs/applications/radio/pothos/default.nix
···
1
1
{ lib
2
2
, mkDerivation
3
3
, fetchFromGitHub
4
+
, fetchpatch
4
5
, cmake
5
6
, pkg-config
6
7
, doxygen
···
33
34
patches = [
34
35
# spuce's CMakeLists.txt uses QT5_USE_Modules, which does not seem to work on Nix
35
36
./spuce.patch
37
+
# Poco had some breaking API changes in 1.12
38
+
(fetchpatch {
39
+
name = "poco-1.12-compat.patch";
40
+
url = "https://github.com/pothosware/PothosCore/commit/092d1209b0fd0aa8a1733706c994fa95e66fd017.patch";
41
+
hash = "sha256-bZXG8kD4+1LgDV8viZrJ/DMjg8UvW7b5keJQDXurfkA=";
42
+
})
36
43
];
37
44
38
45
nativeBuildInputs = [ cmake pkg-config doxygen wrapQtAppsHook ];
+16
-26
pkgs/development/libraries/poco/default.nix
+16
-26
pkgs/development/libraries/poco/default.nix
···
1
-
{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }:
1
+
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, pcre2, expat, sqlite, openssl, unixODBC, libmysqlclient }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "poco";
5
5
6
-
version = "1.11.1";
6
+
version = "1.12.4";
7
7
8
-
src = fetchurl {
9
-
url = "https://pocoproject.org/releases/${pname}-${version}/${pname}-${version}-all.tar.gz";
10
-
sha256 = "sha256-MczOYCAEcnAAO/tbDafirUMohMI9PNUJyG9HzzpeXSo=";
8
+
src = fetchFromGitHub {
9
+
owner = "pocoproject";
10
+
repo = "poco";
11
+
sha256 = "sha256-gQ97fkoTGI6yuMPjEsITfapH9FSQieR8rcrPR1nExxc=";
12
+
rev = "poco-${version}-release";
11
13
};
12
14
13
-
patches = [
14
-
# Use GNUInstallDirs (https://github.com/pocoproject/poco/pull/3503)
15
-
(fetchpatch {
16
-
name = "use-gnuinstalldirs.patch";
17
-
url = "https://github.com/pocoproject/poco/commit/16a2a74f6c28c6e6baca2ba26b4964b51d8a1b74.patch";
18
-
sha256 = "sha256-mkemG8UemJEUQxae1trKakhnJFJW0AufDYFAbmnINbY=";
19
-
# Files not included in release tarball
20
-
excludes = [
21
-
"Encodings/Compiler/CMakeLists.txt"
22
-
"PocoDoc/CMakeLists.txt"
23
-
"NetSSL_Win/CMakeLists.txt"
24
-
"PDF/CMakeLists.txt"
25
-
"SevenZip/CMakeLists.txt"
26
-
"ApacheConnector/CMakeLists.txt"
27
-
"CppParser/CMakeLists.txt"
28
-
];
29
-
})
30
-
];
31
-
32
15
nativeBuildInputs = [ cmake pkg-config ];
33
16
34
17
buildInputs = [ unixODBC libmysqlclient ];
35
-
propagatedBuildInputs = [ zlib pcre expat sqlite openssl ];
18
+
propagatedBuildInputs = [ zlib pcre2 expat sqlite openssl ];
36
19
37
20
outputs = [ "out" "dev" ];
38
21
···
43
26
"-DPOCO_UNBUNDLED=ON"
44
27
];
45
28
29
+
postFixup = ''
30
+
grep -rlF INTERFACE_INCLUDE_DIRECTORIES "$dev/lib/cmake/Poco" | while read -r f; do
31
+
substituteInPlace "$f" \
32
+
--replace "$"'{_IMPORT_PREFIX}/include' ""
33
+
done
34
+
'';
35
+
46
36
meta = with lib; {
47
37
homepage = "https://pocoproject.org/";
48
38
description = "Cross-platform C++ libraries with a network/internet focus";
49
39
license = licenses.boost;
50
-
maintainers = with maintainers; [ orivej ];
40
+
maintainers = with maintainers; [ orivej tomodachi94 ];
51
41
platforms = platforms.unix;
52
42
};
53
43
}