diff options
author | Aristid Breitkreuz <aristidb@gmail.com> | 2014-10-09 20:35:41 +0200 |
---|---|---|
committer | Aristid Breitkreuz <aristidb@gmail.com> | 2014-10-09 20:35:41 +0200 |
commit | 78b8a7794c3c270ac4102f7bf27e89aeeacf059a (patch) | |
tree | e3541bf08af598d85902e3e1b3c68d36d2f5cf8f /pkgs/development | |
parent | afe8b54b4948a8e8c4085c493da119c7b049b957 (diff) | |
parent | 9db29d7e5b4073b5e4417113363b96643d16c865 (diff) | |
download | nixpkgs-78b8a7794c3c270ac4102f7bf27e89aeeacf059a.tar nixpkgs-78b8a7794c3c270ac4102f7bf27e89aeeacf059a.tar.gz nixpkgs-78b8a7794c3c270ac4102f7bf27e89aeeacf059a.tar.bz2 nixpkgs-78b8a7794c3c270ac4102f7bf27e89aeeacf059a.tar.lz nixpkgs-78b8a7794c3c270ac4102f7bf27e89aeeacf059a.tar.xz nixpkgs-78b8a7794c3c270ac4102f7bf27e89aeeacf059a.tar.zst nixpkgs-78b8a7794c3c270ac4102f7bf27e89aeeacf059a.zip |
Merge pull request #4443 from flazz/master
jq & thrift build on darwin
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/thrift/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/jq/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index f8c437f2b0f..4f2b6ec49d7 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { description = "Library for scalable cross-language services"; homepage = http://thrift.apache.org/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 8194ffc22a8..76e74d7623e 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { description = ''A lightweight and flexible command-line JSON processor''; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } |