Skip to content

Commit

Permalink
conmon: backport fix for regression causing NixOS test failure
Browse files Browse the repository at this point in the history
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
  • Loading branch information
amarshall committed Dec 16, 2023
1 parent ceb8e4e commit a5c5888
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions pkgs/applications/virtualization/conmon/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch2
, pkg-config
, glib
, glibc
Expand All @@ -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 ];
Expand Down

0 comments on commit a5c5888

Please sign in to comment.