Merge pull request #144857 from trofi/fix-catatonit-for-automake-1.16.5

1 files changed, 11 insertions, 1 deletions

diff --git a/pkgs/applications/virtualization/catatonit/default.nix b/pkgs/applications/virtualization/catatonit/default.nix
index 2a9fbdbd27f18..e059a254cb97e 100644
--- a/pkgs/applications/virtualization/catatonit/default.nix
+++ b/pkgs/applications/virtualization/catatonit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, glibc, nixosTests }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, glibc, nixosTests }:
 
 stdenv.mkDerivation rec {
   pname = "catatonit";
@@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-jX4fYC/rpfd3ro2UZ6OEu4kU5wpusOwmEVPWEjxwlW4=";
   };
 
+  patches = [
+    # Pull the fix pending upstream inclusion to support automake-1.16.5:
+    #  https://github.com/openSUSE/catatonit/pull/18
+    (fetchpatch {
+      name = "automake-1.16.5.patch";
+      url = "https://github.com/openSUSE/catatonit/commit/99bb9048f532257f3a2c3856cfa19fe957ab6cec.patch";
+      sha256 = "sha256-ooxVjtWXJddQiBvO9I5aRyLeL8y3ecxW/Kvtfg/bpRA=";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];