Merge pull request #10040 from maxxk/libmemcached-darwin

libmemcached on darwin

+12 -7
+11 -5
pkgs/development/libraries/libmemcached/default.nix
··· 1 - { stdenv, fetchurl, cyrus_sasl, libevent }: 2 3 stdenv.mkDerivation rec { 4 name = "libmemcached-1.0.18"; 5 - 6 src = fetchurl { 7 url = https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz; 8 sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; 9 }; 10 - 11 # Fix linking against libpthread (patch from Fedora) 12 # https://bugzilla.redhat.com/show_bug.cgi?id=1037707 13 # https://bugs.launchpad.net/libmemcached/+bug/1281907 14 - patches = [ ./libmemcached-fix-linking-with-libpthread.patch ]; 15 16 buildInputs = [ cyrus_sasl libevent ]; 17 ··· 19 homepage = http://libmemcached.org; 20 description = "Open source C/C++ client library and tools for the memcached server"; 21 license = licenses.bsd3; 22 - platforms = platforms.linux; 23 }; 24 }
··· 1 + { stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: 2 3 stdenv.mkDerivation rec { 4 name = "libmemcached-1.0.18"; 5 + 6 src = fetchurl { 7 url = https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz; 8 sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; 9 }; 10 + 11 # Fix linking against libpthread (patch from Fedora) 12 # https://bugzilla.redhat.com/show_bug.cgi?id=1037707 13 # https://bugs.launchpad.net/libmemcached/+bug/1281907 14 + # Fix building on OS X (patch from Homebrew) 15 + # https://bugs.launchpad.net/libmemcached/+bug/1245562 16 + patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch 17 + ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { 18 + url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb"; 19 + sha256 = "1nvxwdkxj2a2g39z0g8byxjwnw4pa5xlvsmdk081q63vmfywh7zb"; 20 + }); 21 22 buildInputs = [ cyrus_sasl libevent ]; 23 ··· 25 homepage = http://libmemcached.org; 26 description = "Open source C/C++ client library and tools for the memcached server"; 27 license = licenses.bsd3; 28 + platforms = platforms.linux ++ platforms.darwin; 29 }; 30 }
+1 -2
pkgs/servers/memcached/default.nix
··· 16 homepage = http://memcached.org/; 17 license = licenses.bsd3; 18 maintainers = [ maintainers.coconnor ]; 19 - platforms = platforms.linux; 20 }; 21 } 22 -
··· 16 homepage = http://memcached.org/; 17 license = licenses.bsd3; 18 maintainers = [ maintainers.coconnor ]; 19 + platforms = platforms.linux ++ platforms.darwin; 20 }; 21 }