diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index 1923afdf83f..c14adbda3c5 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -10,8 +10,8 @@ let birdBin = if variant == "bird6" then "bird6" else "bird"; birdc = if variant == "bird6" then "birdc6" else "birdc"; descr = - { bird = "1.9.x with IPv4 suport"; - bird6 = "1.9.x with IPv6 suport"; + { bird = "1.6.x with IPv4 support"; + bird6 = "1.6.x with IPv6 support"; bird2 = "2.x"; }.${variant}; in { diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index f00136d041f..3a661d31acd 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests +{ stdenv, lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests , makeWrapper , gawk , glibc @@ -26,7 +26,7 @@ buildGoPackage rec { postInstall = '' echo "complete -C $out/bin/vault vault" > vault.bash installShellCompletion vault.bash - + '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/vault \ --prefix PATH ${lib.makeBinPath [ gawk glibc ]} ''; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 8d82061c061..a247b711b71 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -40,10 +40,10 @@ in stdenv.mkDerivation { mkdir -p $out/bin $out/share/bash-completion/completions mv vault $out/bin echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault - + '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/vault \ --prefix PATH ${lib.makeBinPath [ gawk glibc ]} - + '' + '' runHook postInstall '';