diff options
| author | Domen Kožar <domen@dev.si> | 2021-09-13 13:52:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 13:52:51 +0200 |
| commit | 7a3646885315f79ea1efaa0d396414d92d4acac1 (patch) | |
| tree | 80c76b3da815e091bce512698cc6fdd8c04eb3f0 | |
| parent | 0f279e2e0c1ba0ad5bfbd79f055b9a2a9773f080 (diff) | |
| parent | 0ce7438bd6ffa161bccb10fe693b86a18a579a85 (diff) | |
Merge pull request #137605 from emilazy/aarch64-darwin-fixes
{pv,mosh}: fix on aarch64-darwin
| -rw-r--r-- | pkgs/tools/misc/pv/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/tools/networking/mosh/default.nix | 8 |
2 files changed, 23 insertions, 3 deletions
diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 013ddb8e3dab..5e58b128d8e3 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,13 +1,25 @@ -{ lib, stdenv, fetchurl } : +{ lib +, stdenv +, fetchurl +, fetchpatch +}: stdenv.mkDerivation rec { - name = "pv-1.6.6"; + name = "pv-1.6.20"; src = fetchurl { url = "https://www.ivarch.com/programs/sources/${name}.tar.bz2"; - sha256 = "1wbk14xh9rfypiwyy68ssl8dliyji30ly70qki1y2xx3ywszk3k0"; + sha256 = "00y6zla8h653sn4axgqz7rr0x79vfwl62a7gn6lzn607zwg9acg8"; }; + patches = [ + # Fix build on aarch64-darwin using patch from Homebrew + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/homebrew-core/0780f1df9fdbd8914ff50ac24eb0ec0d3561c1b7/Formula/pv.rb"; + sha256 = "001xayskfprri4s2gd3bqwajw6nz6nv0ggb0835par7q7bsd0dzr"; + }) + ]; + meta = { homepage = "http://www.ivarch.com/programs/pv"; description = "Tool for monitoring the progress of data through a pipeline"; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 92c241967ae0..00746a7afbd2 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -31,6 +31,14 @@ stdenv.mkDerivation rec { ./bash_completion_datadir.patch ]; postPatch = '' + # Fix build with Xcode 12.5 toolchain/case-insensitive filesystems + # Backport of https://github.com/mobile-shell/mosh/commit/12199114fe4234f791ef4c306163901643b40538; + # remove on next upstream release. + patch -p0 < ${fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/70ca3f65e622c17582fd938602d800157ed951c3/net/mosh/files/patch-version-subdir.diff"; + sha256 = "1yyh6d07y9zbdx4fb0r56zkq9nd9knwzj22v4dfi55k4k42qxapd"; + }} + substituteInPlace scripts/mosh.pl \ --subst-var-by ssh "${openssh}/bin/ssh" substituteInPlace scripts/mosh.pl \ |