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 | |
| parent | 6dd72ea0c380eac516815a173e9047bb4608a6a2 (diff) | |
| parent | 9123c8c5de7fcfe0b245ed023e7f52883ae08762 (diff) | |
| download | nixpkgs-c3945dc31c092fb5a48a8d95cb8495bc10017cfb.tar nixpkgs-c3945dc31c092fb5a48a8d95cb8495bc10017cfb.tar.gz nixpkgs-c3945dc31c092fb5a48a8d95cb8495bc10017cfb.tar.bz2 nixpkgs-c3945dc31c092fb5a48a8d95cb8495bc10017cfb.tar.lz nixpkgs-c3945dc31c092fb5a48a8d95cb8495bc10017cfb.tar.xz nixpkgs-c3945dc31c092fb5a48a8d95cb8495bc10017cfb.tar.zst nixpkgs-c3945dc31c092fb5a48a8d95cb8495bc10017cfb.zip | |
Merge pull request #85526 from zowoq/misc
buildah, conmon: misc fixes
| -rw-r--r-- | pkgs/applications/virtualization/conmon/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/buildah/default.nix | 23 |
2 files changed, 19 insertions, 10 deletions
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index b09911cf6e5..bfe9f1d3486 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"; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 7fbb21ffb12..84b28631308 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,5 +1,14 @@ -{ stdenv, buildGoPackage, fetchFromGitHub -, gpgme, libgpgerror, lvm2, btrfs-progs, pkg-config, libselinux, libseccomp +{ stdenv +, buildGoPackage +, fetchFromGitHub +, installShellFiles +, pkg-config +, gpgme +, libgpgerror +, lvm2 +, btrfs-progs +, libselinux +, libseccomp }: buildGoPackage rec { @@ -7,9 +16,9 @@ buildGoPackage rec { version = "1.14.8"; src = fetchFromGitHub { - owner = "containers"; - repo = "buildah"; - rev = "v${version}"; + owner = "containers"; + repo = "buildah"; + rev = "v${version}"; sha256 = "187cvb3i5cwm7cwxmzpl2ca7900yb6v6b6cybyz5mnd5ccy5ff1q"; }; @@ -18,7 +27,7 @@ buildGoPackage rec { goPackagePath = "github.com/containers/buildah"; excludedPackages = [ "tests" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ]; patches = [ ./disable-go-module-mode.patch ]; @@ -27,7 +36,7 @@ buildGoPackage rec { pushd go/src/${goPackagePath} make GIT_COMMIT="unknown" install -Dm755 buildah $bin/bin/buildah - install -Dm444 contrib/completions/bash/buildah $bin/share/bash-completion/completions/buildah + installShellCompletion --bash contrib/completions/bash/buildah ''; postBuild = '' |