about summary refs log tree commit diff
path: root/pkgs/applications/radio
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2023-05-20 13:39:01 +0100
committerGitHub <noreply@github.com>2023-05-20 13:39:01 +0100
commit4babdb661c019a1132a7ecb9103476dbc342750f (patch)
tree102bbee5e6935c8a00222c6ffa2e459cd99a3130 /pkgs/applications/radio
parenteea79d584eff53bf7a76aeb63f8845da6d386129 (diff)
parent61e66c3fba2b58e3a930c1aab3a5a5e70488c0a8 (diff)
Merge pull request #232340 from tomodachi94/update/poco/1.12.4
poco: 1.11.1 -> 1.12.4
Diffstat (limited to 'pkgs/applications/radio')
-rw-r--r--pkgs/applications/radio/pothos/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix
index 1b36b36829a05..6691ffe2dd459 100644
--- a/pkgs/applications/radio/pothos/default.nix
+++ b/pkgs/applications/radio/pothos/default.nix
@@ -1,6 +1,7 @@
 { lib
 , mkDerivation
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , pkg-config
 , doxygen
@@ -33,6 +34,12 @@ mkDerivation rec {
   patches = [
     # spuce's CMakeLists.txt uses QT5_USE_Modules, which does not seem to work on Nix
     ./spuce.patch
+    # Poco had some breaking API changes in 1.12
+    (fetchpatch {
+      name = "poco-1.12-compat.patch";
+      url = "https://github.com/pothosware/PothosCore/commit/092d1209b0fd0aa8a1733706c994fa95e66fd017.patch";
+      hash = "sha256-bZXG8kD4+1LgDV8viZrJ/DMjg8UvW7b5keJQDXurfkA=";
+    })
   ];
 
   nativeBuildInputs = [ cmake pkg-config doxygen wrapQtAppsHook ];