Unverified Commit 1bc15dbb authored by Yt's avatar Yt Committed by GitHub
Browse files

erlang: use nixpkgs zlib, fix darwin (#367981)

parents 65e49dc1 8b63910a

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;