pyrox.dev
Merge pull request #144857 from trofi/fix-catatonit-for-automake-1.16.5
+11
-1
pkgs/applications/virtualization/catatonit/default.nix
+11
-1
pkgs/applications/virtualization/catatonit/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, autoreconfHook, glibc, nixosTests }:
2
3
stdenv.mkDerivation rec {
4
pname = "catatonit";
···
10
rev = "v${version}";
11
sha256 = "sha256-jX4fYC/rpfd3ro2UZ6OEu4kU5wpusOwmEVPWEjxwlW4=";
12
};
13
14
nativeBuildInputs = [ autoreconfHook ];
15
buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
···
1
+
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, glibc, nixosTests }:
2
3
stdenv.mkDerivation rec {
4
pname = "catatonit";
···
10
rev = "v${version}";
11
sha256 = "sha256-jX4fYC/rpfd3ro2UZ6OEu4kU5wpusOwmEVPWEjxwlW4=";
12
};
13
+
14
+
patches = [
15
+
# Pull the fix pending upstream inclusion to support automake-1.16.5:
16
+
# https://github.com/openSUSE/catatonit/pull/18
17
+
(fetchpatch {
18
+
name = "automake-1.16.5.patch";
19
+
url = "https://github.com/openSUSE/catatonit/commit/99bb9048f532257f3a2c3856cfa19fe957ab6cec.patch";
20
+
sha256 = "sha256-ooxVjtWXJddQiBvO9I5aRyLeL8y3ecxW/Kvtfg/bpRA=";
21
+
})
22
+
];
23
24
nativeBuildInputs = [ autoreconfHook ];
25
buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];