From e5aabf059e02038674b09b8c161bac2fcbf8823d Mon Sep 17 00:00:00 2001 From: Artturi Date: Fri, 21 Apr 2023 22:18:33 +0300 Subject: [PATCH] Merge #227471: texinfo: apply gnulib patch only to version 6.7 (cherry picked from commit db3ab32a6982d2afcbbec29cdd99249753d40aea) Fixes build of version 6.5: https://hydra.nixos.org/build/216602149 --- pkgs/development/tools/misc/texinfo/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 51df8c555e63..364f9b148d8c 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { # This patch is needed for IEEE-standard long doubles on # powerpc64; it does not apply cleanly to texinfo 5.x or # earlier. It is merged upstream in texinfo 6.8. - + lib.optionalString (with lib.strings; versionAtLeast version "6.0" && versionOlder version "6.8") '' + + lib.optionalString (version == "6.7") '' patch -p1 -d gnulib < ${gnulib.passthru.longdouble-redirect-patch} '';