summary refs log tree commit diff
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2022-04-22 22:09:29 -0500
committerGitHub <noreply@github.com>2022-04-22 22:09:29 -0500
commit2dcf00e6f40274614b84319be6e1b14ba346febd (patch)
tree39c9d9171df06727eece0f6c1390a2cef5a2d523
parent8fa51a5c2ba8c214142ff9032bc9646fd9360378 (diff)
parent06e48b1552f20408be3a76edc3b00a70a556c6bb (diff)
downloadnixpkgs-2dcf00e6f40274614b84319be6e1b14ba346febd.tar
nixpkgs-2dcf00e6f40274614b84319be6e1b14ba346febd.tar.gz
nixpkgs-2dcf00e6f40274614b84319be6e1b14ba346febd.tar.bz2
nixpkgs-2dcf00e6f40274614b84319be6e1b14ba346febd.tar.lz
nixpkgs-2dcf00e6f40274614b84319be6e1b14ba346febd.tar.xz
nixpkgs-2dcf00e6f40274614b84319be6e1b14ba346febd.tar.zst
nixpkgs-2dcf00e6f40274614b84319be6e1b14ba346febd.zip
Merge pull request #169543 from trofi/fix-zkfuse-for-gcc-11
zkfuse: add a -std=c++14 workaround for gcc-11
-rw-r--r--pkgs/tools/filesystems/zkfuse/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix
index 456444f3bf5..14938113a1e 100644
--- a/pkgs/tools/filesystems/zkfuse/default.nix
+++ b/pkgs/tools/filesystems/zkfuse/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
         -e 's,"zookeeper\.h",<zookeeper/zookeeper.h>,'
   '';
 
+  # c++17 (gcc-11's default) breaks the build as:
+  #   zkadapter.h:616:33: error: ISO C++17 does not allow dynamic exception specifications
+  NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
+
   installPhase = ''
     mkdir -p $out/bin
     cp -v src/zkfuse $out/bin