diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-11-06 11:07:50 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-11-06 11:14:14 +0000 |
| commit | 0f3744bdb3d9b88b90b27ed36a9b9ab472067b36 (patch) | |
| tree | a48bc7a22947f510d59061435bbb21cc859771b3 /pkgs/applications/virtualization | |
| parent | 4ce91f33400bb0b633467cfebd2023b1b7b1dbb8 (diff) | |
| download | nixpkgs-0f3744bdb3d9b88b90b27ed36a9b9ab472067b36.tar nixpkgs-0f3744bdb3d9b88b90b27ed36a9b9ab472067b36.tar.gz nixpkgs-0f3744bdb3d9b88b90b27ed36a9b9ab472067b36.tar.bz2 nixpkgs-0f3744bdb3d9b88b90b27ed36a9b9ab472067b36.tar.lz nixpkgs-0f3744bdb3d9b88b90b27ed36a9b9ab472067b36.tar.xz nixpkgs-0f3744bdb3d9b88b90b27ed36a9b9ab472067b36.tar.zst nixpkgs-0f3744bdb3d9b88b90b27ed36a9b9ab472067b36.zip | |
catatonit: pull pending upstream inclusion fix for automake-1.16.5
Without the fix build on automake-1.16.5 fails as:
configure.ac:34: error: AM_INIT_AUTOMAKE expanded multiple times
.../automake-1.16.5/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from...
configure.ac:19: the top level
.../automake-1.16.5/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from...
configure.ac:34: the top level
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/catatonit/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/catatonit/default.nix b/pkgs/applications/virtualization/catatonit/default.nix index 2a9fbdbd27f..e059a254cb9 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 ]; |