Merge branch 'redis' of https://github.com/washort/nixpkgs into upstream

fixes for redis on OSX
This commit is contained in:
Shea Levy 2012-12-07 12:28:58 -05:00
commit 5f8647e7ae
2 changed files with 7 additions and 1 deletions

View file

@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
makeFlags = "PREFIX=$(out)";
patches = if stdenv.isDarwin then [ ./darwin.patch ] else [];
meta = {
homepage = http://redis.io;
description = "An open source, advanced key-value store";

View file

@ -5471,7 +5471,12 @@ let
radius = callPackage ../servers/radius { };
redis = callPackage ../servers/nosql/redis { };
redis = callPackage ../servers/nosql/redis {
stdenv =
if stdenv.isDarwin
then overrideGCC stdenv gccApple
else stdenv;
};
redstore = callPackage ../servers/http/redstore { };