Unverified Commit 8b63910a authored by Adam C. Stephens's avatar Adam C. Stephens
Browse files

erlang: use nixpkgs zlib, fix darwin 

Darwin is failing with the bundled zlib. We should be using the nixpkgs
zlib anyway, so add to buildInputs for all.

Removed legacy Darwin sdk pattern.
parent 371e69dc

pkgs/development/interpreters/erlang/generic-builder.nix

+3 −11
Original line number Diff line number Diff line 
{

  pkgs,

  lib,

  stdenv,

  fetchFromGitHub,
@@ -32,6 +31,7 @@ 
  coreutils,

  git,

  wrapGAppsHook3,

  zlib,

}:

{

  baseName ? "erlang",
@@ -144,20 +144,12 @@ stdenv.mkDerivation ( 
      [

        ncurses

        opensslPackage

        zlib

      ]

      ++ optionals wxSupport wxPackages2

      ++ optionals odbcSupport odbcPackages

      ++ optionals javacSupport javacPackages

      ++ optional systemdSupport systemd

      ++ optionals stdenv.hostPlatform.isDarwin (

        with pkgs.darwin.apple_sdk.frameworks;

        [

          AGL

          Carbon

          Cocoa

          WebKit

        ]

      );

      ++ optional systemdSupport systemd;



    debugInfo = enableDebugInfo;