dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

erlang: make systemd optional, add pkgs.beam_minimal

Browse Source
This commit is contained in:
David 2021-09-11 14:50:52 +02:00 committed by Raphael Megzari
parent 1a6d226f03
commit 98bfb51d00
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@ -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;

5
pkgs/top-level/all-packages.nix
View File

@ -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

13
pkgs/top-level/beam-packages.nix
View File

@ -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; };