about summary refs log tree commit diff
path: root/pkgs/servers/http
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-11-11 00:02:47 +0000
committerGitHub <noreply@github.com>2023-11-11 00:02:47 +0000
commit5f5513224f3075c3bc76905121c9a3e06ec30dc4 (patch)
treeab1abc65028ce024e018c5f741b72e435d648330 /pkgs/servers/http
parente8096ee1e1b78e17b362bf9daf67a46c8c02f28b (diff)
parent912311b7fd205f8542aaac6e26251bcb0b92fa7c (diff)
downloadnixlib-5f5513224f3075c3bc76905121c9a3e06ec30dc4.tar
nixlib-5f5513224f3075c3bc76905121c9a3e06ec30dc4.tar.gz
nixlib-5f5513224f3075c3bc76905121c9a3e06ec30dc4.tar.bz2
nixlib-5f5513224f3075c3bc76905121c9a3e06ec30dc4.tar.lz
nixlib-5f5513224f3075c3bc76905121c9a3e06ec30dc4.tar.xz
nixlib-5f5513224f3075c3bc76905121c9a3e06ec30dc4.tar.zst
nixlib-5f5513224f3075c3bc76905121c9a3e06ec30dc4.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r--pkgs/servers/http/apt-cacher-ng/default.nix13
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix
index 9cdc0c58ee44..dd3648961439 100644
--- a/pkgs/servers/http/apt-cacher-ng/default.nix
+++ b/pkgs/servers/http/apt-cacher-ng/default.nix
@@ -1,8 +1,10 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , bzip2
 , cmake
 , doxygen
 , fetchurl
+, fetchpatch
 , fuse
 , libevent
 , xz
@@ -23,6 +25,15 @@ stdenv.mkDerivation rec {
     sha256 = "0pwsj9rf6a6q7cnfbpcrfq2gjcy7sylqzqqr49g2zi39lrrh8533";
   };
 
+  patches = [
+    # this patch fixes the build for glibc >= 2.38
+    (fetchpatch {
+      name = "strlcpy-glibc238.patch";
+      url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=0;bug=1052360;msg=10";
+      hash = "sha256-uhQj+ZcHCV36Tm0pF/+JG59bSaRdTZCrMcKL3YhZTk8=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake doxygen pkg-config ];
   buildInputs = [ bzip2 fuse libevent xz openssl systemd tcp_wrappers zlib c-ares ];