diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix new file mode 100644 index 00000000000..4ef02af106e --- /dev/null +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, glib +, glibc +, systemd +}: + +stdenv.mkDerivation rec { + project = "conmon"; + name = "${project}-${version}"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = project; + rev = "v${version}"; + sha256 = "08fgkbv7hq62lcq39za9pm2s2j92ismgrkvfm7acwbvajqh9syjb"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib systemd ] ++ + stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; + + installPhase = "install -Dm755 bin/${project} $out/bin/${project}"; + + meta = with stdenv.lib; { + homepage = https://github.com/containers/conmon; + description = "An OCI container runtime monitor"; + license = licenses.asl20; + maintainers = with maintainers; [ vdemeester saschagrunert ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 51dd2b1e6df..2e7b476443f 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -41,15 +41,10 @@ buildGoPackage rec { buildPhase = '' pushd go/src/${goPackagePath} - # Build conmon and pause + # Build pause go build -tags ${makeFlags} -o bin/crio-config -buildmode=pie \ -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio-config - pushd conmon - ../bin/crio-config - popd - - make -C conmon make -C pause # Build the crio binary @@ -60,7 +55,6 @@ buildGoPackage rec { install -Dm755 bin/crio $bin/bin/crio${flavor} mkdir -p $bin/libexec/crio - install -Dm755 bin/conmon $bin/libexec/crio/conmon${flavor} install -Dm755 bin/pause $bin/libexec/crio/pause${flavor} ''; diff --git a/pkgs/applications/virtualization/podman/conmon.nix b/pkgs/applications/virtualization/podman/conmon.nix deleted file mode 100644 index dfc3cc35316..00000000000 --- a/pkgs/applications/virtualization/podman/conmon.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, glib }: - -with lib; -with builtins; - -stdenv.mkDerivation rec { - pname = "conmon"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "containers"; - repo = pname; - rev = "v${version}"; - sha256 = "08fgkbv7hq62lcq39za9pm2s2j92ismgrkvfm7acwbvajqh9syjb"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib ]; - - installPhase = '' - install -D -m 555 bin/conmon $out/bin/conmon - ''; - - meta = { - homepage = https://github.com/containers/conmon; - description = "An OCI container runtime monitor"; - license = licenses.asl20; - maintainers = with maintainers; [ vdemeester ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee0333c2442..b686b76da65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5340,7 +5340,6 @@ in podiff = callPackage ../tools/text/podiff { }; podman = callPackage ../applications/virtualization/podman { }; - conmon = callPackage ../applications/virtualization/podman/conmon.nix { }; pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; @@ -21358,6 +21357,8 @@ in confd = callPackage ../tools/system/confd { }; + conmon = callPackage ../applications/virtualization/conmon { }; + construoBase = lowPrio (callPackage ../games/construo { libGL = null; freeglut = null;