diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-24 11:57:44 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-24 11:57:44 +0100 |
| commit | 78b7529ee36603182ae34354d7cbc3dcfc228317 (patch) | |
| tree | 26a9555518aa403f9328dc1a72680e823e3630de /pkgs/development/interpreters | |
| parent | f3886a6fba7dec4d5c97a51558ab0a4489f89d76 (diff) | |
| parent | 4d4980d9f88956f533ecad905c92ab70f0e8cbad (diff) | |
| download | nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.gz nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.bz2 nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.lz nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.xz nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.tar.zst nixlib-78b7529ee36603182ae34354d7cbc3dcfc228317.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/erlang/R16.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/interpreters/rakudo/default.nix | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index ffc4c27e6629..02f9d1f98e81 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -2,7 +2,8 @@ , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null , wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null -, enableDebugInfo ? false }: +, enableDebugInfo ? false +, Carbon ? null, Cocoa ? null }: assert wxSupport -> mesa != null && wxGTK != null && xorg != null; assert odbcSupport -> unixODBC != null; @@ -23,7 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] - ++ optional odbcSupport [ unixODBC ]; + ++ optional odbcSupport [ unixODBC ] + ++ optional stdenv.isDarwin [ Carbon Cocoa ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 51b1bb85be68..210570ad8468 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, perl, icu, zlib, gmp, readline }: +{ stdenv, fetchurl, perl, icu, zlib, gmp, readline +, CoreServices, ApplicationServices }: stdenv.mkDerivation rec { name = "rakudo-star-${version}"; @@ -9,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0czx7w1chf108mpyps7k7nqq8cbsy1rbb87ajms9xj65l4ywg8ka"; }; - buildInputs = [ icu zlib gmp readline perl ]; + buildInputs = [ icu zlib gmp readline perl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; configureScript = "perl ./Configure.pl"; configureFlags = [ "--backends=moar" |