diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-11-19 08:40:26 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-11-19 08:42:00 +0000 |
| commit | eafed17eff28c28683f14edd96b5830429385f9a (patch) | |
| tree | 0ab2650f21687840af3c4ccd4ccad4c5b0d0e639 /pkgs/os-specific/linux/tiptop | |
| parent | 293e6f0ce5e0db0cbc7ba783c0b3ff31293f3d8f (diff) | |
| download | nixpkgs-eafed17eff28c28683f14edd96b5830429385f9a.tar nixpkgs-eafed17eff28c28683f14edd96b5830429385f9a.tar.gz nixpkgs-eafed17eff28c28683f14edd96b5830429385f9a.tar.bz2 nixpkgs-eafed17eff28c28683f14edd96b5830429385f9a.tar.lz nixpkgs-eafed17eff28c28683f14edd96b5830429385f9a.tar.xz nixpkgs-eafed17eff28c28683f14edd96b5830429385f9a.tar.zst nixpkgs-eafed17eff28c28683f14edd96b5830429385f9a.zip | |
tiptop: pull upstream patch for ncurses-6.3 support
Without the patch build fails on ncurses-6.3 as:
helpwin.c:64:3: error: format not a string literal and no format arguments [-Werror=format-security]
64 | mvwprintw(win, 2, 1, screen->desc);
| ^~~~~~~~~
Diffstat (limited to 'pkgs/os-specific/linux/tiptop')
| -rw-r--r-- | pkgs/os-specific/linux/tiptop/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix index c6870d2a4c4..bb9fa285982 100644 --- a/pkgs/os-specific/linux/tiptop/default.nix +++ b/pkgs/os-specific/linux/tiptop/default.nix @@ -9,11 +9,20 @@ stdenv.mkDerivation rec { sha256 = "10j1138y3cj3hsmfz4w0bmk90523b0prqwi9nhb4z8xvjnf49i2i"; }; - patches = [(fetchpatch { - name = "reproducibility.patch"; - url = "https://salsa.debian.org/debian/tiptop/raw/debian/2.3.1-1/debian/patches/0001-fix-reproducibility-of-build-process.patch"; - sha256 = "116l7n3nl9lj691i7j8x0d0za1i6zpqgghw5d70qfpb17c04cblp"; - })]; + patches = [ + (fetchpatch { + name = "reproducibility.patch"; + url = "https://salsa.debian.org/debian/tiptop/raw/debian/2.3.1-1/debian/patches/0001-fix-reproducibility-of-build-process.patch"; + sha256 = "116l7n3nl9lj691i7j8x0d0za1i6zpqgghw5d70qfpb17c04cblp"; + }) + + # Pull upstream patch for ncurses-6.3 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://gitlab.inria.fr/rohou/tiptop/-/commit/a78234c27fdd62fed09430d998950e49e11a1832.patch"; + sha256 = "1k55agdri7iw3gwm4snj3ps62qzmxlqr6s0868l8qamjw38z9g00"; + }) + ]; postPatch = '' substituteInPlace ./configure --replace -lcurses -lncurses |