From 7216159cbee6b16d8289a36ce663f91751ae0ec5 Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Thu, 24 Sep 2015 18:34:02 +0300 Subject: [PATCH 1/2] memcached: build on darwin Versions up to 1.4.24 are broken when building with clang: https://code.google.com/p/memcached/issues/detail?id=409 --- pkgs/servers/memcached/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 294cb003ab43..9d110d9c1461 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { homepage = http://memcached.org/; license = licenses.bsd3; maintainers = [ maintainers.coconnor ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } - From 8ba640d932d69a1c25d7a4906955d6780e7b24e4 Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Thu, 24 Sep 2015 18:47:19 +0300 Subject: [PATCH 2/2] libmemcached: build on darwin (patch from homebrew) --- .../libraries/libmemcached/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 16196c9abc93..619aa0144976 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchurl, cyrus_sasl, libevent }: +{ stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: stdenv.mkDerivation rec { name = "libmemcached-1.0.18"; - + src = fetchurl { url = https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz; sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; }; - + # Fix linking against libpthread (patch from Fedora) # https://bugzilla.redhat.com/show_bug.cgi?id=1037707 # https://bugs.launchpad.net/libmemcached/+bug/1281907 - patches = [ ./libmemcached-fix-linking-with-libpthread.patch ]; + # Fix building on OS X (patch from Homebrew) + # https://bugs.launchpad.net/libmemcached/+bug/1245562 + patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch + ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb"; + sha256 = "1nvxwdkxj2a2g39z0g8byxjwnw4pa5xlvsmdk081q63vmfywh7zb"; + }); buildInputs = [ cyrus_sasl libevent ]; @@ -19,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://libmemcached.org; description = "Open source C/C++ client library and tools for the memcached server"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; }