Skip to content

Commit 1bc15db

Browse files
authored
erlang: use nixpkgs zlib, fix darwin (#367981)
2 parents 65e49dc + 8b63910 commit 1bc15db

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
pkgs,
32
lib,
43
stdenv,
54
fetchFromGitHub,
@@ -32,6 +31,7 @@
3231
coreutils,
3332
git,
3433
wrapGAppsHook3,
34+
zlib,
3535
}:
3636
{
3737
baseName ? "erlang",
@@ -144,20 +144,12 @@ stdenv.mkDerivation (
144144
[
145145
ncurses
146146
opensslPackage
147+
zlib
147148
]
148149
++ optionals wxSupport wxPackages2
149150
++ optionals odbcSupport odbcPackages
150151
++ optionals javacSupport javacPackages
151-
++ optional systemdSupport systemd
152-
++ optionals stdenv.hostPlatform.isDarwin (
153-
with pkgs.darwin.apple_sdk.frameworks;
154-
[
155-
AGL
156-
Carbon
157-
Cocoa
158-
WebKit
159-
]
160-
);
152+
++ optional systemdSupport systemd;
161153

162154
debugInfo = enableDebugInfo;
163155

0 commit comments

Comments
 (0)