public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17685 from matthewbauer/darwin-misc2

Browse Source 
Darwin misc. fixes
This commit is contained in:
Daniel Peebles
2016-08-24 11:52:27 +02:00
committed by GitHub
parent 76223aa4b2 a6faa04ee4
commit 3f337a2b23
44 changed files with 162 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/erlang/R16.nix
View File

@@ -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 '';

6
pkgs/development/interpreters/rakudo/default.nix
View File

@@ -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"