diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-04-27 10:03:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 10:03:52 +0100 |
| commit | a90356e08a994476a1a8fe35cbe41c9f99014fc8 (patch) | |
| tree | 859b4600ad5eca205f61297364277779e06be6c9 /pkgs/servers | |
| parent | a6b85b96d4c5d8101c49661594dc5ad4eaa07656 (diff) | |
| parent | 454f8ef82aa776c8fd6a3da8bcf72211c3f6cfa9 (diff) | |
| download | nixpkgs-a90356e08a994476a1a8fe35cbe41c9f99014fc8.tar nixpkgs-a90356e08a994476a1a8fe35cbe41c9f99014fc8.tar.gz nixpkgs-a90356e08a994476a1a8fe35cbe41c9f99014fc8.tar.bz2 nixpkgs-a90356e08a994476a1a8fe35cbe41c9f99014fc8.tar.lz nixpkgs-a90356e08a994476a1a8fe35cbe41c9f99014fc8.tar.xz nixpkgs-a90356e08a994476a1a8fe35cbe41c9f99014fc8.tar.zst nixpkgs-a90356e08a994476a1a8fe35cbe41c9f99014fc8.zip | |
Merge pull request #86035 from zowoq/go-fixes
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/mail-exporter.nix | 8 | ||||
| -rw-r--r-- | pkgs/servers/sql/cockroachdb/default.nix | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 1e29eefba2b..f845a6ef256 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage { pname = "mailexporter"; @@ -15,9 +15,11 @@ buildGoPackage { goDeps = ./mail-exporter_deps.nix; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' - install -D -m 0444 -t $bin/share/man/man1 $src/man/mailexporter.1 - install -D -m 0444 -t $bin/share/man/man5 $src/man/mailexporter.conf.5 + installManPage $src/man/mailexporter.1 + installManPage $src/man/mailexporter.conf.5 ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 8f3d2a7b285..fb62ee58474 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -1,6 +1,7 @@ { stdenv, buildGoPackage, fetchurl , cmake, xz, which, autoconf , ncurses6, libedit, libunwind +, installShellFiles }: let @@ -8,7 +9,7 @@ let linuxDeps = [ ncurses6 ]; buildInputs = if stdenv.isDarwin then darwinDeps else linuxDeps; - nativeBuildInputs = [ cmake xz which autoconf ]; + nativeBuildInputs = [ installShellFiles cmake xz which autoconf ]; in buildGoPackage rec { @@ -42,7 +43,7 @@ buildGoPackage rec { runHook preInstall install -D cockroachoss $bin/bin/cockroach - install -D cockroach.bash $bin/share/bash-completion/completions/cockroach.bash + installShellCompletion cockroach.bash mkdir -p $man/share/man cp -r man $man/share/man |