about summary refs log tree commit diff
path: root/pkgs/development/libraries/qca-qt5
diff options
context:
space:
mode:
authorSergei Trofimovich <slyich@gmail.com>2021-09-10 22:28:41 +0100
committerSergei Trofimovich <slyich@gmail.com>2021-11-26 23:57:09 +0000
commit4648545542a33726ef9eecccc3e5393a52f012ae (patch)
tree33a2764bddf31688d12ff504d4cee5264b34708b /pkgs/development/libraries/qca-qt5
parent25cdc0a9c904cd989cfe060f5a3fe93629dbf894 (diff)
qca-qt5: fix gcc-11 from upstream
Without the change build n `gcc-11` fails as:

    $ nix build --impure --expr 'with import ./. {}; qca-qt5.override { stdenv = gcc11Stdenv; }' -L
    ...
    ...gcc-11.2.0/include/c++/11.2.0/bits/stl_raw_storage_iter.h:69:22: error: expected template-name before '<' token
       69 |     : public iterator<output_iterator_tag, void, void, void, void>
          |                      ^
Diffstat (limited to 'pkgs/development/libraries/qca-qt5')
-rw-r--r--pkgs/development/libraries/qca-qt5/default.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix
index f8159417378c0..9bd57e7ae97ba 100644
--- a/pkgs/development/libraries/qca-qt5/default.nix
+++ b/pkgs/development/libraries/qca-qt5/default.nix
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-wThREJq+/EYjNwmJ+uOnRb9rGss8KhOolYU5gj6XTks=";
   };
 
+  patches = [
+    # Pull upstream fix for gcc-11
+    (fetchurl {
+      url = "https://github.com/KDE/qca/commit/32275f1a74c161d2fed8c056b2dd9555687a22f2.patch";
+      sha256 = "sha256-SUH2eyzP2vH/ZjYcX8ybwiqhoTm/QjuEpTKjb2iH1No=";
+    })
+  ];
+
   buildInputs = [ openssl qtbase ];
   nativeBuildInputs = [ cmake pkg-config ];