diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-04 22:40:39 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-04 22:40:39 +0100 |
commit | ead4c02affa92335172aa92be158cc0bbf071caa (patch) | |
tree | d5863d1cb8266424a3e9758d67dc0afc37615523 /pkgs | |
parent | aebc72401d54fd45dab0d680837e2f69cd95ff9e (diff) | |
parent | 0e0fc78f85dd976ab07356bf7083452d5e33ddb7 (diff) | |
download | nixpkgs-ead4c02affa92335172aa92be158cc0bbf071caa.tar nixpkgs-ead4c02affa92335172aa92be158cc0bbf071caa.tar.gz nixpkgs-ead4c02affa92335172aa92be158cc0bbf071caa.tar.bz2 nixpkgs-ead4c02affa92335172aa92be158cc0bbf071caa.tar.lz nixpkgs-ead4c02affa92335172aa92be158cc0bbf071caa.tar.xz nixpkgs-ead4c02affa92335172aa92be158cc0bbf071caa.tar.zst nixpkgs-ead4c02affa92335172aa92be158cc0bbf071caa.zip |
Merge pull request #265495 from wegank/libb64-clang-16
libb64: fix build with clang 16
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libb64/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 38f16fa5bb1..3b24089e53c 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -30,6 +30,13 @@ stdenv.mkDerivation rec { url = "https://github.com/libb64/libb64/commit/b5edeafc89853c48fa41a4c16393a1fdc8638ab6.patch"; hash = "sha256-+bqfOOlT/t0FLQEMHuxW1BxJcx9rk0yYM3wD43mcymo"; }) + # Fix build with Clang 16. + # https://github.com/libb64/libb64/pull/10 + (fetchpatch { + name = "use-proper-function-prototype-for-main.patch"; + url = "https://github.com/libb64/libb64/commit/98eaf510f40e384b32c01ad4bd5c3a697fdd8560.patch"; + hash = "sha256-CGslJUw0og/bBBirLm0J5Q7cf2WW/vniVAkXHlb6lbQ="; + }) ] ++ 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"; |