stanchion: add Darwin support

stanchion: make pam nullify typesafe

stanchion: add Darwin support

stanchion: make pam OS-checked inside of stanchion.nix

stanchion: add Darwin support

stanchion: remove OS-checked pam on all-packages.nix

stanchion: add Darwin support
This commit is contained in:
Matthew Daiter 2016-12-16 17:41:42 +01:00
parent 1946e872c0
commit 4661689a49
2 changed files with 7 additions and 4 deletions

View File

@ -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 { stdenv.mkDerivation rec {
name = "stanchion-2.1.1"; name = "stanchion-2.1.1";
buildInputs = [ 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 { src = fetchurl {
url = "http://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz"; url = "http://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz";
@ -57,7 +59,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
maintainers = with maintainers; [ mdaiter ]; maintainers = with maintainers; [ mdaiter ];
description = "Manager for Riak CS"; description = "Manager for Riak CS";
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" "x86_64-darwin" ];
license = licenses.asl20; license = licenses.asl20;
}; };
} }

View File

@ -10293,6 +10293,7 @@ in
}; };
stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
erlang = erlang_basho_R16B02; erlang = erlang_basho_R16B02;
}; };