diff options
author | Matthew Daiter <mdaiter8121@gmail.com> | 2016-12-16 17:41:42 +0100 |
---|---|---|
committer | Matthew Daiter <mdaiter8121@gmail.com> | 2016-12-18 00:59:34 +0100 |
commit | 4661689a49614043b659d66c02de7990150bc742 (patch) | |
tree | 2fa6b4486bbd392fe6569ae16a07d48a20c686e9 /pkgs | |
parent | 1946e872c04079f25e30ed9b3fa9e09f9f9e661c (diff) | |
download | nixlib-4661689a49614043b659d66c02de7990150bc742.tar nixlib-4661689a49614043b659d66c02de7990150bc742.tar.gz nixlib-4661689a49614043b659d66c02de7990150bc742.tar.bz2 nixlib-4661689a49614043b659d66c02de7990150bc742.tar.lz nixlib-4661689a49614043b659d66c02de7990150bc742.tar.xz nixlib-4661689a49614043b659d66c02de7990150bc742.tar.zst nixlib-4661689a49614043b659d66c02de7990150bc742.zip |
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
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/nosql/riak-cs/stanchion.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/servers/nosql/riak-cs/stanchion.nix b/pkgs/servers/nosql/riak-cs/stanchion.nix index 5835b7e29c93..8ea71d611ebb 100644 --- a/pkgs/servers/nosql/riak-cs/stanchion.nix +++ b/pkgs/servers/nosql/riak-cs/stanchion.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 = "stanchion-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/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz"; @@ -57,7 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { maintainers = with maintainers; [ mdaiter ]; description = "Manager for Riak CS"; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.asl20; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d1dbc3c607c..9e686a4e8500 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10293,6 +10293,7 @@ in }; stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; erlang = erlang_basho_R16B02; }; |