Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b66139cac83c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 58c693c9216b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 24, 2020

  1. mosh: fix build with bash-completion 2.10 

    Fixes #85893
    @KamilaBorowska
    KamilaBorowska committed Apr 24, 2020
    Copy the full SHA
    d655b91 View commit details

  2. Merge pull request #85919 from xfix/fix-build-with-bash-completion

    @Mic92
    Mic92 authored Apr 24, 2020
    Copy the full SHA
    58c693c View commit details
Showing with 21 additions and 0 deletions.
  1. +19 −0 pkgs/tools/networking/mosh/bash_completion_datadir.patch
  2. +2 −0 pkgs/tools/networking/mosh/default.nix
19 changes: 19 additions & 0 deletions pkgs/tools/networking/mosh/bash_completion_datadir.patch
View file
Original file line number Diff line number Diff line change
@@ -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([
2 changes: 2 additions & 0 deletions pkgs/tools/networking/mosh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 \