From c47e91117767bbca63d3c3e2ec5d1f12a4faee83 Mon Sep 17 00:00:00 2001 From: Allen Short <ashort@mozilla.com> Date: Fri, 7 Dec 2012 09:22:51 -0800 Subject: [PATCH] fixes for redis on OSX --- pkgs/servers/nosql/redis/default.nix | 1 + pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index e2e111a81fb..c6c641b1491 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb85702119f..97afba4ff51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5473,7 +5473,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 { };