From a5ac419236853e3fa3d020abfa072a1555efe85c Mon Sep 17 00:00:00 2001 From: Asko Soukka Date: Sun, 25 Oct 2015 14:37:15 +0200 Subject: [PATCH 1/2] darwin: erlangR18: add needed inputs for Darwin --- pkgs/development/interpreters/erlang/R18.nix | 4 +++- pkgs/top-level/all-packages.nix | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 7646de28a85..f2392f5f1f5 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper +, AppKit, Carbon, Cocoa , odbcSupport ? false, unixODBC ? null , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null , javacSupport ? false, openjdk ? null @@ -29,7 +30,8 @@ stdenv.mkDerivation rec { [ perl gnum4 ncurses openssl makeWrapper ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) ++ 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 ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 759174ce985..c6881d1370f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4913,10 +4913,21 @@ let erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; }; erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; }; erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; }; - erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { }; - erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix { odbcSupport = true; }; - erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix { javacSupport = true; }; - erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix { javacSupport = true; odbcSupport = true; }; + erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { + inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; + }; + 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_odbc = erlangR18_odbc; erlang_javac = erlangR18_javac; From 3ea269a7e673e07b2f0a2b6a88ecd0212a87c535 Mon Sep 17 00:00:00 2001 From: Asko Soukka Date: Sun, 25 Oct 2015 14:37:31 +0200 Subject: [PATCH 2/2] darwin: rabbitmq_server: add needed inputs for Darwin --- pkgs/servers/amqp/rabbitmq-server/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 3e8ec09a0b0..5bf3f2e693e 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -1,5 +1,8 @@ { 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 { name = "rabbitmq-server-${version}"; @@ -12,7 +15,8 @@ stdenv.mkDerivation rec { }; 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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6881d1370f..94e42523eb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9319,7 +9319,9 @@ let 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 { };