diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-04-19 19:26:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-19 19:26:41 -0500 |
| commit | c3945dc31c092fb5a48a8d95cb8495bc10017cfb (patch) | |
| tree | 066ab02ce094998df90f04d191c6b6b32122f913 /pkgs/applications/virtualization | |
| parent | 6dd72ea0c380eac516815a173e9047bb4608a6a2 (diff) | |
| parent | 9123c8c5de7fcfe0b245ed023e7f52883ae08762 (diff) | |
| download | nixlib-c3945dc31c092fb5a48a8d95cb8495bc10017cfb.tar nixlib-c3945dc31c092fb5a48a8d95cb8495bc10017cfb.tar.gz nixlib-c3945dc31c092fb5a48a8d95cb8495bc10017cfb.tar.bz2 nixlib-c3945dc31c092fb5a48a8d95cb8495bc10017cfb.tar.lz nixlib-c3945dc31c092fb5a48a8d95cb8495bc10017cfb.tar.xz nixlib-c3945dc31c092fb5a48a8d95cb8495bc10017cfb.tar.zst nixlib-c3945dc31c092fb5a48a8d95cb8495bc10017cfb.zip | |
Merge pull request #85526 from zowoq/misc
buildah, conmon: misc fixes
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/conmon/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index b09911cf6e50..bfe9f1d34865 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -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"; |