pyrox.dev / nixpkgs
lol
fork atom

darwin: erlangR18: add needed inputs for Darwin

Asko Soukka a5ac4192 6e9f77dc

+18 -5
unified split
+3 -1
pkgs/development/interpreters/erlang/R18.nix
··· 1 1 { stdenv, fetchurl, perl, gnum4, ncurses, openssl 2 2 , gnused, gawk, makeWrapper 3 + , AppKit, Carbon, Cocoa 3 4 , odbcSupport ? false, unixODBC ? null 4 5 , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null 5 6 , javacSupport ? false, openjdk ? null ··· 29 30 [ perl gnum4 ncurses openssl makeWrapper 30 31 ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) 31 32 ++ optional odbcSupport [ unixODBC ] 32 - ++ optional javacSupport [ openjdk ]; 33 + ++ optional javacSupport [ openjdk ] 34 + ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; 33 35 34 36 patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; 35 37
+15 -4
pkgs/top-level/all-packages.nix
··· 4913 4913 erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; }; 4914 4914 erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; }; 4915 4915 erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; }; 4916 - erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { }; 4917 - erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix { odbcSupport = true; }; 4918 - erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix { javacSupport = true; }; 4919 - erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix { javacSupport = true; odbcSupport = true; }; 4916 + erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { 4917 + inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; 4918 + }; 4919 + erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix { 4920 + inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; 4921 + odbcSupport = true; 4922 + }; 4923 + erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix { 4924 + inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; 4925 + javacSupport = true; 4926 + }; 4927 + erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix { 4928 + inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; 4929 + javacSupport = true; odbcSupport = true; 4930 + }; 4920 4931 erlang = erlangR18; 4921 4932 erlang_odbc = erlangR18_odbc; 4922 4933 erlang_javac = erlangR18_javac;