diff options
| author | Artturi <Artturin@artturin.com> | 2023-04-21 22:18:33 +0300 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-04-23 09:05:56 +0200 |
| commit | e5aabf059e02038674b09b8c161bac2fcbf8823d (patch) | |
| tree | f6b311f20cdc27b2c5e2086b4972c1711d187695 /pkgs | |
| parent | 52f2c9fe9e925ca8e4b342bc69e0dc3228c0316a (diff) | |
| download | nixlib-e5aabf059e02038674b09b8c161bac2fcbf8823d.tar nixlib-e5aabf059e02038674b09b8c161bac2fcbf8823d.tar.gz nixlib-e5aabf059e02038674b09b8c161bac2fcbf8823d.tar.bz2 nixlib-e5aabf059e02038674b09b8c161bac2fcbf8823d.tar.lz nixlib-e5aabf059e02038674b09b8c161bac2fcbf8823d.tar.xz nixlib-e5aabf059e02038674b09b8c161bac2fcbf8823d.tar.zst nixlib-e5aabf059e02038674b09b8c161bac2fcbf8823d.zip | |
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
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/texinfo/common.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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} ''; |