conmon: backport fix for regression causing NixOS test failure

Should fix `nix-build -A podman.passthru.tests`, see bug report NixOS#274655 See also upstream: containers/conmon#476 containers/conmon#475 containers/conmon#477
Lainera · Dec 20, 2023 · 7bbc06f · 7bbc06f
1 parent 00e3fe2
commit 7bbc06f
Showing 1 changed file with 9 additions and 0 deletions.
diff --git 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 ];