diff options
| author | Andrew Marshall <andrew@johnandrewmarshall.com> | 2023-12-16 07:45:45 -0500 |
|---|---|---|
| committer | Andrew Marshall <andrew@johnandrewmarshall.com> | 2023-12-16 07:50:12 -0500 |
| commit | a5c588846c34505074ed84103d15e0a87b65d55e (patch) | |
| tree | 9d0ed726f8e6e2b63fd0dd99e50dce90b5292cb6 /pkgs/applications/virtualization/conmon | |
| parent | ceb8e4efd95627c0a86f106ba2afcd207ad5c6b3 (diff) | |
conmon: backport fix for regression causing NixOS test failure
Should fix `nix-build -A podman.passthru.tests`, see bug report
https://github.com/NixOS/nixpkgs/issues/274655
See also upstream:
https://github.com/containers/conmon/pull/476
https://github.com/containers/conmon/issues/475
https://github.com/containers/conmon/issues/477
Diffstat (limited to 'pkgs/applications/virtualization/conmon')
| -rw-r--r-- | pkgs/applications/virtualization/conmon/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index c0d8bf884a20..ea729afb76f0 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , pkg-config , glib , glibc @@ -20,6 +21,14 @@ stdenv.mkDerivation rec { hash = "sha256-GDbCjR3UWDo/AEKO3TZq29fxO9EUfymxWtvLBikJJ04="; }; + patches = [ + (fetchpatch2 { + # Fix regression with several upstream bug reports; also caused podman NixOS tests to fail + url = "https://github.com/containers/conmon/commit/53531ac78d35aa9e18a20cfff9f30b910e25ecaa.patch"; + hash = "sha256-rbLoXDmRK8P94rrhx2r22/EHZVpCsGTWItd/GW1VqZA="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libseccomp systemd ] ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; |