Merge commit 'a1dd419c1ffacea87eba066a2bb332e03cb68f66'

4 files changed, 43 insertions, 40 deletions

diff --git a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix
new file mode 100644
index 000000000000..4ef02af106e3
--- /dev/null
+++ b/nixpkgs/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/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix
index 51dd2b1e6dfa..2e7b476443fd 100644
--- a/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix
+++ b/nixpkgs/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/nixpkgs/pkgs/applications/virtualization/lkl/default.nix b/nixpkgs/pkgs/applications/virtualization/lkl/default.nix
index d870e2466167..40503ab89d70 100644
--- a/nixpkgs/pkgs/applications/virtualization/lkl/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/lkl/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive }:
+{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive
+, buildPackages }:
 
 stdenv.mkDerivation rec {
   name = "lkl-2018-08-22";
@@ -40,7 +41,12 @@ stdenv.mkDerivation rec {
   #   crypto/jitterentropy.c:54:3: error: #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c."
   hardeningDisable = [ "format" "fortify" ];
 
-  makeFlags = "-C tools/lkl";
+  makeFlags = [
+    "-C tools/lkl"
+    "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
+    "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/nixpkgs/pkgs/applications/virtualization/podman/conmon.nix b/nixpkgs/pkgs/applications/virtualization/podman/conmon.nix
deleted file mode 100644
index dfc3cc353165..000000000000
--- a/nixpkgs/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;
-  };
-}