diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-04-24 12:10:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 12:10:11 +0100 |
| commit | 58c693c9216bdd4ab3ca1f19595248b08734aa3b (patch) | |
| tree | 3991c43c6c1db032318494aa059e457bac5d93b7 /pkgs/tools/networking | |
| parent | b66139cac83ce2474a39e78b9d1d5daca0808406 (diff) | |
| parent | d655b917c1f594be01258c346b779414b93cca41 (diff) | |
| download | nixlib-58c693c9216bdd4ab3ca1f19595248b08734aa3b.tar nixlib-58c693c9216bdd4ab3ca1f19595248b08734aa3b.tar.gz nixlib-58c693c9216bdd4ab3ca1f19595248b08734aa3b.tar.bz2 nixlib-58c693c9216bdd4ab3ca1f19595248b08734aa3b.tar.lz nixlib-58c693c9216bdd4ab3ca1f19595248b08734aa3b.tar.xz nixlib-58c693c9216bdd4ab3ca1f19595248b08734aa3b.tar.zst nixlib-58c693c9216bdd4ab3ca1f19595248b08734aa3b.zip | |
Merge pull request #85919 from xfix/fix-build-with-bash-completion
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/mosh/bash_completion_datadir.patch | 19 | ||||
| -rw-r--r-- | pkgs/tools/networking/mosh/default.nix | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/tools/networking/mosh/bash_completion_datadir.patch b/pkgs/tools/networking/mosh/bash_completion_datadir.patch new file mode 100644 index 000000000000..4b71f125d287 --- /dev/null +++ b/pkgs/tools/networking/mosh/bash_completion_datadir.patch @@ -0,0 +1,19 @@ +diff --git a/configure.ac b/configure.ac +index 3ad983d..ff8ff96 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -476,13 +476,7 @@ AS_IF([echo "$protobuf_LIBS" | grep -q -- -pthread], + + # Bash completion needs to ask where it goes if >= 2.0 is installed. + AS_IF([test "$install_completion" != no], +- [PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], +- [if test "$prefix" = "NONE"; then +- completions="`pkg-config --variable=completionsdir bash-completion`" +- else +- completions="`pkg-config --define-variable=prefix=$prefix --variable=completionsdir bash-completion`" +- fi], +- [completions="${sysconfdir}/bash_completion.d"]) ++ [completions="`pkg-config --define-variable=datadir=$datadir --variable=completionsdir bash-completion`"] + AC_SUBST([completions])]) + + AC_CONFIG_FILES([ diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 648fdb9d20e8..26c9035cd79b 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { url = "https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0.patch"; sha256 = "15518rb0r5w1zn4s6981bf1sz6ins6gpn2saizfzhmr13hw4gmhm"; }) + # Fix build with bash-completion 2.10 + ./bash_completion_datadir.patch ]; postPatch = '' substituteInPlace scripts/mosh.pl \ |