diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-12-02 10:04:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-02 10:04:16 +0000 |
| commit | 0106804da3f6b26260e018ae3be4fe86664231da (patch) | |
| tree | 3c9d433a84e8c78615b06fc7dcedb9403ffe2eef /pkgs/shells | |
| parent | 2e64e975bbff9b2fd30dc45f63726528c393fdb7 (diff) | |
| parent | 0a854379c43a257de5fba04a35703134d1faa291 (diff) | |
| download | nixpkgs-0106804da3f6b26260e018ae3be4fe86664231da.tar nixpkgs-0106804da3f6b26260e018ae3be4fe86664231da.tar.gz nixpkgs-0106804da3f6b26260e018ae3be4fe86664231da.tar.bz2 nixpkgs-0106804da3f6b26260e018ae3be4fe86664231da.tar.lz nixpkgs-0106804da3f6b26260e018ae3be4fe86664231da.tar.xz nixpkgs-0106804da3f6b26260e018ae3be4fe86664231da.tar.zst nixpkgs-0106804da3f6b26260e018ae3be4fe86664231da.zip | |
bash-completion: Fix tests with musl. (#74813)
bash-completion: Fix tests with musl.
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash/bash-completion/default.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index fbc07c86494..fb9707c3224 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -1,4 +1,6 @@ { stdenv, fetchFromGitHub +, lib +, fetchpatch , autoreconfHook , python3Packages , bashInteractive @@ -6,6 +8,7 @@ stdenv.mkDerivation rec { pname = "bash-completion"; + # TODO: Remove musl patch below upon next release! version = "2.9"; src = fetchFromGitHub { @@ -26,6 +29,15 @@ stdenv.mkDerivation rec { patches = [ ./0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + # TODO: Remove when https://github.com/scop/bash-completion/commit/2cdac1b9f24df62a1fa80c1824ee8524c9b02393 + # is availabe in a release in nixpkgs. see https://github.com/scop/bash-completion/issues/312. + # Fixes a test failure with musl. + (fetchpatch { + url = "https://github.com/scop/bash-completion/commit/2cdac1b9f24df62a1fa80c1824ee8524c9b02393.patch"; + name = "bash-completion-musl-test_iconv-skip-option-completion-if-help-fails"; + sha256 = "1l53d62zf01k625nzw3vcrxky93h7bzdpchgk4argxalrn17ckvb"; + }) ]; # ignore ip_addresses because it tries to touch network |