Skip to content

Commit

Permalink
[Backport release-24.11] erlang: use nixpkgs zlib, fix darwin (#368060)
Browse files Browse the repository at this point in the history
  • Loading branch information
adamcstephens authored Dec 25, 2024
2 parents c2658dd + 1cf1990 commit f374c5b
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 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,7 @@
coreutils,
git,
wrapGAppsHook3,
zlib,
}:
{
baseName ? "erlang",
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit f374c5b

Please sign in to comment.