Merge pull request #85526 from zowoq/misc

buildah, conmon: misc fixes
2020-04-19 19:26:41 -05:00
parent 6dd72ea0c3 9123c8c5de
commit c3945dc31c
2 changed files with 19 additions and 10 deletions
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ glib systemd ] ++
-    stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
+  buildInputs = [ glib systemd ]
+  ++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];

-  installPhase = "install -Dm755 bin/${pname} $out/bin/${pname}";
+  installFlags = [ "PREFIX=$(out)" ];

  meta = with stdenv.lib; {
    homepage = "https://github.com/containers/conmon";