diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-11 00:02:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-11 00:02:21 +0000 |
| commit | 912311b7fd205f8542aaac6e26251bcb0b92fa7c (patch) | |
| tree | 26d796194c7c4876ab89abc33183afb8be38621b /pkgs/servers/http | |
| parent | 96ec4cfbb67ebbe7661ea77d65df06399888151d (diff) | |
| parent | 02f05fceedefc00f90ecf27bda9e94ed2318aa50 (diff) | |
| download | nixlib-912311b7fd205f8542aaac6e26251bcb0b92fa7c.tar nixlib-912311b7fd205f8542aaac6e26251bcb0b92fa7c.tar.gz nixlib-912311b7fd205f8542aaac6e26251bcb0b92fa7c.tar.bz2 nixlib-912311b7fd205f8542aaac6e26251bcb0b92fa7c.tar.lz nixlib-912311b7fd205f8542aaac6e26251bcb0b92fa7c.tar.xz nixlib-912311b7fd205f8542aaac6e26251bcb0b92fa7c.tar.zst nixlib-912311b7fd205f8542aaac6e26251bcb0b92fa7c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/apt-cacher-ng/default.nix | 13 |
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 ]; |