diff options
| author | Artturi <Artturin@artturin.com> | 2021-11-21 23:35:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-21 23:35:36 +0200 |
| commit | 06e83482be9a0a750d4b0bf08c89e046985ba4c9 (patch) | |
| tree | 787b8cc7c3b4b5cdb680dcefa8efc6ba9663acba /pkgs/tools | |
| parent | ac833956f0c0e81e515378e4b63858c15d7879a9 (diff) | |
| parent | ae0e800b8921615d3df39526dff0cee4dab5d563 (diff) | |
| download | nixpkgs-06e83482be9a0a750d4b0bf08c89e046985ba4c9.tar nixpkgs-06e83482be9a0a750d4b0bf08c89e046985ba4c9.tar.gz nixpkgs-06e83482be9a0a750d4b0bf08c89e046985ba4c9.tar.bz2 nixpkgs-06e83482be9a0a750d4b0bf08c89e046985ba4c9.tar.lz nixpkgs-06e83482be9a0a750d4b0bf08c89e046985ba4c9.tar.xz nixpkgs-06e83482be9a0a750d4b0bf08c89e046985ba4c9.tar.zst nixpkgs-06e83482be9a0a750d4b0bf08c89e046985ba4c9.zip | |
Merge pull request #144972 from trofi/fix-gfs2-utils-for-ncurses-6.3
gfs2-utils: pull pending upstream inclusion fix for ncurses-6.3
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/filesystems/gfs2-utils/default.nix | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/gfs2-utils/default.nix b/pkgs/tools/filesystems/gfs2-utils/default.nix index ba479b87aa9..3f68888776c 100644 --- a/pkgs/tools/filesystems/gfs2-utils/default.nix +++ b/pkgs/tools/filesystems/gfs2-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, fetchpatch , autoreconfHook, bison, flex, pkg-config , bzip2, check, ncurses, util-linux, zlib }: @@ -12,6 +12,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-gwKxBBG5PtG4/RxX4sUC25ZeG8K2urqVkFDKL7NS4ZI="; }; + patches = [ + # pull pending upstream inclusion fix for ncurses-6.3: sent upstream over email. + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://pagure.io/fork/slyfox/gfs2-utils/c/c927b635f380cca77665195a3aaae804d92870a4.patch"; + sha256 = "sha256-0M1xAqRXoUi2el03WODF/nqEe9JEE5GehMWs776QZNI="; + }) + ]; + postPatch = '' + # Apply fix for ncurses-6.3. Upstream development branch already reworked the code. + # To be removed on next reelase. + substituteInPlace gfs2/edit/gfs2hex.c --replace 'printw(title);' 'printw("%s",title);' + ''; + outputs = [ "bin" "doc" "out" "man" ]; nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; |