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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0d944d525aa..2a21a905cf2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12695,6 +12695,11 @@ with pkgs; beam = callPackage ./beam-packages.nix { }; beam_nox = callPackage ./beam-packages.nix { beam = beam_nox; wxSupport = false; }; + beam_minimal = callPackage ./beam-packages.nix { + beam = beam_minimal; + wxSupport = false; + systemdSupport = false; + }; inherit (beam.interpreters) erlang erlangR24 erlangR23 erlangR22 erlangR21 diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 1b5ff3a3f25a..bdd8b6e32516 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,4 +1,7 @@ -{ beam, callPackage, wxGTK30, buildPackages, wxSupport ? true }: +{ beam, callPackage, wxGTK30, buildPackages, stdenv +, wxSupport ? true +, systemdSupport ? stdenv.isLinux +}: with beam; { lib = callPackage ../development/beam-modules/lib.nix { }; @@ -23,7 +26,7 @@ with beam; { # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; - inherit wxSupport; + inherit wxSupport systemdSupport; }; erlangR24_odbc = erlangR24.override { odbcSupport = true; }; erlangR24_javac = erlangR24.override { javacSupport = true; }; @@ -38,7 +41,7 @@ with beam; { # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; - inherit wxSupport; + inherit wxSupport systemdSupport; }; erlangR23_odbc = erlangR23.override { odbcSupport = true; }; erlangR23_javac = erlangR23.override { javacSupport = true; }; @@ -53,7 +56,7 @@ with beam; { # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 parallelBuild = true; autoconf = buildPackages.autoconf269; - inherit wxSupport; + inherit wxSupport systemdSupport; }; erlangR22_odbc = erlangR22.override { odbcSupport = true; }; erlangR22_javac = erlangR22.override { javacSupport = true; }; @@ -66,7 +69,7 @@ with beam; { erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { wxGTK = wxGTK30; autoconf = buildPackages.autoconf269; - inherit wxSupport; + inherit wxSupport systemdSupport; }; erlangR21_odbc = erlangR21.override { odbcSupport = true; }; erlangR21_javac = erlangR21.override { javacSupport = true; };