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

Merge pull request #10603 from datakurre/datakurre-rabbitmq

Browse Source 
darwin: erlangR18 + rabbitmq_server: add needed inputs
This commit is contained in:
Jude Taylor 2015-10-28 17:23:11 -07:00
commit e6bc23a801
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/erlang/R18.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl { stdenv, fetchurl, perl, gnum4, ncurses, openssl
, gnused, gawk, makeWrapper , gnused, gawk, makeWrapper
, AppKit, Carbon, Cocoa
, odbcSupport ? false, unixODBC ? null , odbcSupport ? false, unixODBC ? null
, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null
, javacSupport ? false, openjdk ? null , javacSupport ? false, openjdk ? null
@ -29,7 +30,8 @@ stdenv.mkDerivation rec {
[ perl gnum4 ncurses openssl makeWrapper [ perl gnum4 ncurses openssl makeWrapper
] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ])
++ optional odbcSupport [ unixODBC ] ++ optional odbcSupport [ unixODBC ]
++ optional javacSupport [ openjdk ]; ++ optional javacSupport [ openjdk ]
++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';

8
pkgs/servers/amqp/rabbitmq-server/default.nix
View File

@ -1,5 +1,8 @@
{ stdenv, fetchurl, erlang, python, libxml2, libxslt, xmlto { stdenv, fetchurl, erlang, python, libxml2, libxslt, xmlto
, docbook_xml_dtd_45, docbook_xsl, zip, unzip }: , docbook_xml_dtd_45, docbook_xsl, zip, unzip
, AppKit, Carbon, Cocoa
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rabbitmq-server-${version}"; name = "rabbitmq-server-${version}";
@ -12,7 +15,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ erlang python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip ]; [ erlang python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip ]
++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];
preBuild = preBuild =
'' ''

23
pkgs/top-level/all-packages.nix
View File

@ -4910,10 +4910,21 @@ let
erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; }; erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; };
erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; }; erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; };
erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; }; erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; };
erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { }; erlangR18 = callPackage ../development/interpreters/erlang/R18.nix {
erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix { odbcSupport = true; }; inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix { javacSupport = true; }; };
erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix { javacSupport = true; odbcSupport = true; }; erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix {
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
odbcSupport = true;
};
erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix {
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
javacSupport = true;
};
erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix {
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
javacSupport = true; odbcSupport = true;
};
erlang = erlangR18; erlang = erlangR18;
erlang_odbc = erlangR18_odbc; erlang_odbc = erlangR18_odbc;
erlang_javac = erlangR18_javac; erlang_javac = erlangR18_javac;
@ -9317,7 +9328,9 @@ let
qpid-cpp = callPackage ../servers/amqp/qpid-cpp { }; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { };
rabbitmq_server = callPackage ../servers/amqp/rabbitmq-server { }; rabbitmq_server = callPackage ../servers/amqp/rabbitmq-server {
inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
};
radius = callPackage ../servers/radius { }; radius = callPackage ../servers/radius { };