Skip to content

Commit

Permalink
erlang: use nixpkgs zlib, fix darwin
Browse files Browse the repository at this point in the history
Darwin is failing with the bundled zlib. We should be using the nixpkgs
zlib anyway, so add to buildInputs for all.

Updated Darwin to newer apple-sdk package.
  • Loading branch information
adamcstephens committed Dec 24, 2024
1 parent 371e69d commit 6e8cec7
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions pkgs/development/interpreters/erlang/generic-builder.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
pkgs,
lib,
stdenv,
fetchFromGitHub,
Expand Down Expand Up @@ -32,6 +31,8 @@
coreutils,
git,
wrapGAppsHook3,
apple-sdk,
zlib,
}:
{
baseName ? "erlang",
Expand Down Expand Up @@ -144,20 +145,15 @@ 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
]
);
++ optionals stdenv.hostPlatform.isDarwin [
apple-sdk
];

debugInfo = enableDebugInfo;

Expand Down

0 comments on commit 6e8cec7

Please sign in to comment.