From 058e009d6956896d335cf62c43adc8950c9aa0d8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 27 May 2023 12:41:44 +0200 Subject: libb64: Fix i686-linux build failure https://hydra.nixos.org/build/221506062 (cherry picked from commit 015722217e0cdf61410170c116554fabdbfc9215) --- pkgs/development/libraries/libb64/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 88bc059892cf9..38f16fa5bb1fb 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -19,6 +19,17 @@ stdenv.mkDerivation rec { url = "https://github.com/libb64/libb64/commit/4fe47c052e9123da8f751545deb48be08c3411f6.patch"; sha256 = "18b3np3gpyzimqmk6001riqv5n70wfbclky6zzsrvj5zl1dj4ljf"; }) + # Fix i686-linux build failure. + (fetchpatch { + name = "elif.patch"; + url = "https://github.com/libb64/libb64/commit/819e43c8b34261ea3ee694bdc27865a033966083.patch"; + hash = "sha256-r2jI6Q3rWDtArLlkAuyy7vcjsuRvX+2fBd5yk8XOMcc"; + }) + (fetchpatch { + name = "size_t.patch"; + url = "https://github.com/libb64/libb64/commit/b5edeafc89853c48fa41a4c16393a1fdc8638ab6.patch"; + hash = "sha256-+bqfOOlT/t0FLQEMHuxW1BxJcx9rk0yYM3wD43mcymo"; + }) ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (fetchpatch { name = "0001-example-Do-not-run-the-tests.patch"; url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch?id=484e0de1e4ee107f21ae2a5c5f976ed987978baf"; -- cgit 1.4.1