Merge pull request #85919 from xfix/fix-build-with-bash-completion
This commit is contained in:
commit
58c693c921
19
pkgs/tools/networking/mosh/bash_completion_datadir.patch
Normal file
19
pkgs/tools/networking/mosh/bash_completion_datadir.patch
Normal file
@ -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([
|
@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
|
|||||||
url = "https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0.patch";
|
url = "https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0.patch";
|
||||||
sha256 = "15518rb0r5w1zn4s6981bf1sz6ins6gpn2saizfzhmr13hw4gmhm";
|
sha256 = "15518rb0r5w1zn4s6981bf1sz6ins6gpn2saizfzhmr13hw4gmhm";
|
||||||
})
|
})
|
||||||
|
# Fix build with bash-completion 2.10
|
||||||
|
./bash_completion_datadir.patch
|
||||||
];
|
];
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace scripts/mosh.pl \
|
substituteInPlace scripts/mosh.pl \
|
||||||
|
Loading…
Reference in New Issue
Block a user