pyrox.dev
lol
pothos: fix the build against poco-1.14
+50
pkgs/applications/radio/pothos/cstring.patch
+50
pkgs/applications/radio/pothos/cstring.patch
···
···
1
+
Submodule blocks contains modified content
2
+
diff --git a/blocks/file/BinaryFileSink.cpp b/blocks/file/BinaryFileSink.cpp
3
+
index 31c9a41..0083b0d 100644
4
+
--- a/blocks/file/BinaryFileSink.cpp
5
+
+++ b/blocks/file/BinaryFileSink.cpp
6
+
@@ -13,6 +13,7 @@
7
+
#endif //_MSC_VER
8
+
#include <stdio.h>
9
+
#include <cerrno>
10
+
+#include <cstring>
11
+
12
+
#ifndef O_BINARY
13
+
#define O_BINARY 0
14
+
diff --git a/blocks/file/BinaryFileSource.cpp b/blocks/file/BinaryFileSource.cpp
15
+
index 0151231..379d383 100644
16
+
--- a/blocks/file/BinaryFileSource.cpp
17
+
+++ b/blocks/file/BinaryFileSource.cpp
18
+
@@ -13,6 +13,7 @@
19
+
#endif //_MSC_VER
20
+
#include <stdio.h>
21
+
#include <cerrno>
22
+
+#include <cstring>
23
+
24
+
#ifndef O_BINARY
25
+
#define O_BINARY 0
26
+
diff --git a/blocks/file/TextFileSink.cpp b/blocks/file/TextFileSink.cpp
27
+
index b4b2f08..2be66e2 100644
28
+
--- a/blocks/file/TextFileSink.cpp
29
+
+++ b/blocks/file/TextFileSink.cpp
30
+
@@ -6,6 +6,7 @@
31
+
#include <complex>
32
+
#include <fstream>
33
+
#include <cerrno>
34
+
+#include <cstring>
35
+
36
+
/***********************************************************************
37
+
* |PothosDoc Text File Sink
38
+
Submodule soapy contains modified content
39
+
diff --git a/soapy/DemoController.cpp b/soapy/DemoController.cpp
40
+
index 4ce8ead..9a4e742 100644
41
+
--- a/soapy/DemoController.cpp
42
+
+++ b/soapy/DemoController.cpp
43
+
@@ -6,6 +6,7 @@
44
+
#include <iostream>
45
+
#include <chrono>
46
+
#include <algorithm> //min/max
47
+
+#include <cstring>
48
+
49
+
/***********************************************************************
50
+
* |PothosDoc SDR Demo Controller
+8
pkgs/applications/radio/pothos/default.nix
+8
pkgs/applications/radio/pothos/default.nix
···
18
alsa-lib,
19
muparserx,
20
python3,
21
}:
22
23
mkDerivation rec {
···
41
url = "https://github.com/pothosware/PothosCore/commit/092d1209b0fd0aa8a1733706c994fa95e66fd017.patch";
42
hash = "sha256-bZXG8kD4+1LgDV8viZrJ/DMjg8UvW7b5keJQDXurfkA=";
43
})
44
];
45
46
nativeBuildInputs = [
47
cmake
48
pkg-config
···
62
alsa-lib
63
muparserx
64
python3
65
];
66
67
postInstall = ''
···
18
alsa-lib,
19
muparserx,
20
python3,
21
+
utf8proc,
22
}:
23
24
mkDerivation rec {
···
42
url = "https://github.com/pothosware/PothosCore/commit/092d1209b0fd0aa8a1733706c994fa95e66fd017.patch";
43
hash = "sha256-bZXG8kD4+1LgDV8viZrJ/DMjg8UvW7b5keJQDXurfkA=";
44
})
45
+
# various source files are missing imports of <cstring>
46
+
# https://github.com/pothosware/PothosBlocks/issues/80
47
+
./cstring.patch
48
];
49
50
+
# poco 1.14 requires c++17
51
+
NIX_CFLAGS_COMPILE = [ "-std=gnu++17" ];
52
+
53
nativeBuildInputs = [
54
cmake
55
pkg-config
···
69
alsa-lib
70
muparserx
71
python3
72
+
utf8proc
73
];
74
75
postInstall = ''