about summary refs log tree commit diff
path: root/pkgs/tools/filesystems/encfs
diff options
context:
space:
mode:
authorRandy Eckenrode <randy@largeandhighquality.com>2023-11-09 21:36:52 -0500
committerRandy Eckenrode <randy@largeandhighquality.com>2023-11-10 09:01:10 -0500
commit1d2d4ec8fa23ea40b7b70818c8bfad2dd4172268 (patch)
tree63aa40b16c71d3f87eed68204ee885c3b09226df /pkgs/tools/filesystems/encfs
parent9a0c85ffc5aedc46b4d81f3b9fc22d7f488e3ff9 (diff)
encfs: fix build with newer versions of clang
Apply patch to resolve the following error:

    error: no matching constructor for initialization of 'std::shared_ptr<AbstractCipherKey>'
Diffstat (limited to 'pkgs/tools/filesystems/encfs')
-rw-r--r--pkgs/tools/filesystems/encfs/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index 14701a615c01e..966c396823928 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub, fetchpatch
 , cmake, pkg-config, perl
 , gettext, fuse, openssl, tinyxml2
 }:
@@ -14,6 +14,15 @@ stdenv.mkDerivation rec {
     owner = "vgough";
   };
 
+  patches = lib.optionals stdenv.cc.isClang [
+    # Fixes a build failure when building with newer versions of clang.
+    # https://github.com/vgough/encfs/pull/650
+    (fetchpatch {
+      url = "https://github.com/vgough/encfs/commit/406b63bfe234864710d1d23329bf41d48001fbfa.patch";
+      hash = "sha256-VunC5ICRJBgCXqkr7ad7DPzweRJr1bdOpo1LKNCs4zY=";
+    })
+  ];
+
   buildInputs = [ gettext fuse openssl tinyxml2 ];
   nativeBuildInputs = [ cmake pkg-config perl ];