From 085683c613a7595ea95a703e715200e24c9e99a1 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Mon, 10 Feb 2020 12:27:16 +0900 Subject: [PATCH] memcached: fix darwin build --- pkgs/servers/memcached/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 004822b906ca..681439bb9411 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cyrus_sasl, libevent}: +{stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent}: stdenv.mkDerivation rec { version = "1.5.21"; @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { sha256 = "1x4jzrz09aq4nllkarn7d5x77gsys5l3nvfj8c7j4nvmvc30rlg3"; }; + patches = [ + # Fixes compilation error on Darwin due to redeclaration of + # htonll. The fix should appear in 1.5.23. + # https://github.com/memcached/memcached/issues/598 + (fetchpatch { + url = "https://github.com/memcached/memcached/commit/95c67710aaf5cfe188d94b510faef8c66d6f5604.diff"; + sha256 = "0ab5l24p4n4fpx78ilmg7jvs9nl84pdza90jbpbx3ns5n23pqbfs"; + }) + ]; + configureFlags = [ "ac_cv_c_endian=${if stdenv.hostPlatform.isBigEndian then "big" else "little"}" ];