From 6e8cec73bc0f4ead09b58be52625ea569d52524f Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 24 Dec 2024 13:37:47 -0500 Subject: [PATCH] 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. Updated Darwin to newer apple-sdk package. --- .../interpreters/erlang/generic-builder.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 499d3b7f879f04..b904bda1446b0a 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,5 +1,4 @@ { - pkgs, lib, stdenv, fetchFromGitHub, @@ -32,6 +31,8 @@ coreutils, git, wrapGAppsHook3, + apple-sdk, + zlib, }: { baseName ? "erlang", @@ -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;