diff options
| author | David <dlesl@users.noreply.github.com> | 2021-09-11 14:50:52 +0200 |
|---|---|---|
| committer | Raphael Megzari <raphael@megzari.com> | 2021-09-11 23:11:17 +0900 |
| commit | 98bfb51d00a2e5b94cf9aa5d56e7eaa82001387e (patch) | |
| tree | 1c328e44c15718ba121290e932cf2cab006a1522 /pkgs/development/interpreters | |
| parent | 1a6d226f03821135266650c7d99929335c815ad3 (diff) | |
erlang: make systemd optional, add `pkgs.beam_minimal`
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/erlang/generic-builder.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 13d2d33abfcd..3d5c692930b6 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -22,6 +22,7 @@ , parallelBuild ? false , systemd , wxSupport ? true +, systemdSupport ? stdenv.isLinux # systemd support in epmd # updateScript deps , writeScript , common-updater-scripts @@ -42,7 +43,6 @@ , javacPackages ? [ openjdk11 ] , odbcSupport ? false , odbcPackages ? [ unixODBC ] -, withSystemd ? stdenv.isLinux # systemd support in epmd , opensslPackage ? openssl , wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , preUnpack ? "" @@ -96,7 +96,7 @@ stdenv.mkDerivation ({ ++ optionals wxSupport wxPackages2 ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages - ++ optional withSystemd systemd + ++ optional systemdSupport systemd ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa WebKit ]); debugInfo = enableDebugInfo; @@ -123,7 +123,7 @@ stdenv.mkDerivation ({ ++ optional javacSupport "--with-javac" ++ optional odbcSupport "--with-odbc=${unixODBC}" ++ optional wxSupport "--enable-wx" - ++ optional withSystemd "--enable-systemd" + ++ optional systemdSupport "--enable-systemd" ++ optional stdenv.isDarwin "--enable-darwin-64bit" ++ configureFlags; |