From 1090a269ab4ca65e4a3be5d0fb01613b87c63b6f Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Sun, 18 Dec 2016 03:38:42 +0100 Subject: [PATCH] riak-cs: add Darwin support --- pkgs/servers/nosql/riak-cs/2.1.1.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix index 439af4da565b..a0df98faf360 100644 --- a/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -1,11 +1,13 @@ -{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak }: +{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam, coreutils, riak +, Carbon ? null, Cocoa ? null }: stdenv.mkDerivation rec { name = "riak_cs-2.1.1"; buildInputs = [ - which unzip erlang pam git wget - ]; + which unzip erlang git wget + ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ] + ++ lib.optional stdenv.isLinux [ pam ]; src = fetchurl { url = "http://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz"; @@ -60,7 +62,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Dynamo inspired NoSQL DB by Basho with S3 compatibility"; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.asl20; maintainer = with maintainers; [ mdaiter ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2502d36dbfa..28785ede360a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10291,6 +10291,7 @@ in riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; erlang = erlang_basho_R16B02; };