commit 9df9c1992b1859b50a0607b43ea577611ded8cd9 · pyrox.dev/nixpkgs

nixos/modules/config/no-x-libs.nix

···

       29
       29
        
           nixpkgs.overlays = singleton (const (super: {

     

       30
       30
        
             cairo = super.cairo.override { x11Support = false; };

     

       31
       31
        
             dbus = super.dbus.override { x11Support = false; };

     

       32
       32
       +
             beam = super.beam_nox;

     

       32
       33
        
             networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; };

     

       33
       34
        
             networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };

     

       34
       35
        
             networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; };

+3 -3

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

···

       3
       3
        
       # TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731

     

       4
       4
        
       , openjdk8 ? null # javacSupport

     

       5
       5
        
       , unixODBC ? null # odbcSupport

     

       6
       6
       -
       , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport

     

       6
       6
       +
       , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null, wxSupport ? true

     

       7
       7
        
       , parallelBuild ? false

     

       8
       8
        
       , systemd

     

       9
       9
        
       }:

     

       10
       10
       -
       

     

       10
       10
       +
       let defaultWxSupport = wxSupport; in

     

       11
       11
        
       { baseName ? "erlang"

     

       12
       12
        
       , version

     

       13
       13
        
       , sha256 ? null

     
···

       21
       21
        
       , javacSupport ? false, javacPackages ? [ openjdk8 ]

     

       22
       22
        
       , odbcSupport ? false, odbcPackages ? [ unixODBC ]

     

       23
       23
        
       , withSystemd ? stdenv.isLinux # systemd support in epmd

     

       24
       24
       -
       , wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]

     

       24
       24
       +
       , wxSupport ? defaultWxSupport, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]

     

       25
       25
        
       , preUnpack ? "", postUnpack ? ""

     

       26
       26
        
       , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""

     

       27
       27
        
       , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? ""

+4 -1

pkgs/top-level/all-packages.nix

···

       10980
       10980
        
         };

     

       10981
       10981
        
       

     

       10982
       10982
        
         beam = callPackage ./beam-packages.nix { };

     

       10983
       10983
       +
         beam_nox = callPackage ./beam-packages.nix { wxSupport = false; };

     

       10983
       10984
        
       

     

       10984
       10985
        
         inherit (beam.interpreters)

     

       10985
       10986
        
           erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18

     

       10986
       10986
       -
           erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02

     

       10987
       10987
       +
           erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02

     

       10987
       10988
        
           elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7;

     

       10989
       10989
       +
       

     

       10990
       10990
       +
         erlang_nox = beam_nox.interpreters.erlang;

     

       10988
       10991
        
       

     

       10989
       10992
        
         inherit (beam.packages.erlang)

     

       10990
       10993
        
           rebar rebar3

+8 -8

pkgs/top-level/beam-packages.nix

···

       1
       1
       -
       { callPackage, wxGTK30, openssl_1_0_2, buildPackages }:

     

       1
       1
       +
       { callPackage, wxGTK30, openssl_1_0_2, buildPackages, wxSupport ? true }:

     

       2
       2
        
       

     

       3
       3
        
       rec {

     

       4
       4
        
         lib = callPackage ../development/beam-modules/lib.nix { };

     
···

       11
       11
        
           erlang_odbc = erlangR23_odbc;

     

       12
       12
        
           erlang_javac = erlangR23_javac;

     

       13
       13
        
           erlang_odbc_javac = erlangR23_odbc_javac;

     

       14
       14
       -
           erlang_nox = erlangR23_nox;

     

       15
       14
        
       

     

       16
       15
        
           # Standard Erlang versions, using the generic builder.

     

       17
       16
        
       

     
···

       21
       20
        
             # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508

     

       22
       21
        
             parallelBuild = true;

     

       23
       22
        
             autoconf = buildPackages.autoconf269;

     

       23
       23
       +
             inherit wxSupport;

     

       24
       24
        
           };

     

       25
       25
        
           erlangR23_odbc = erlangR23.override { odbcSupport = true; };

     

       26
       26
        
           erlangR23_javac = erlangR23.override { javacSupport = true; };

     
···

       28
       28
        
             javacSupport = true;

     

       29
       29
        
             odbcSupport = true;

     

       30
       30
        
           };

     

       31
       31
       -
           erlangR23_nox = erlangR23.override { wxSupport = false; };

     

       32
       31
        
       

     

       33
       32
        
           # R22

     

       34
       33
        
           erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix {

     
···

       36
       35
        
             # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508

     

       37
       36
        
             parallelBuild = true;

     

       38
       37
        
             autoconf = buildPackages.autoconf269;

     

       38
       38
       +
             inherit wxSupport;

     

       39
       39
        
           };

     

       40
       40
        
           erlangR22_odbc = erlangR22.override { odbcSupport = true; };

     

       41
       41
        
           erlangR22_javac = erlangR22.override { javacSupport = true; };

     
···

       43
       43
        
             javacSupport = true;

     

       44
       44
        
             odbcSupport = true;

     

       45
       45
        
           };

     

       46
       46
       -
           erlangR22_nox = erlangR22.override { wxSupport = false; };

     

       47
       46
        
       

     

       48
       47
        
           # R21

     

       49
       48
        
           erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix {

     

       50
       49
        
             wxGTK = wxGTK30;

     

       51
       50
        
             autoconf = buildPackages.autoconf269;

     

       51
       51
       +
             inherit wxSupport;

     

       52
       52
        
           };

     

       53
       53
        
           erlangR21_odbc = erlangR21.override { odbcSupport = true; };

     

       54
       54
        
           erlangR21_javac = erlangR21.override { javacSupport = true; };

     
···

       56
       56
        
             javacSupport = true;

     

       57
       57
        
             odbcSupport = true;

     

       58
       58
        
           };

     

       59
       59
       -
           erlangR21_nox = erlangR21.override { wxSupport = false; };

     

       60
       59
        
       

     

       61
       60
        
           # R20

     

       62
       61
        
           erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix {

     

       63
       62
        
             wxGTK = wxGTK30;

     

       64
       63
        
             autoconf = buildPackages.autoconf269;

     

       64
       64
       +
             inherit wxSupport;

     

       65
       65
        
           };

     

       66
       66
        
           erlangR20_odbc = erlangR20.override { odbcSupport = true; };

     

       67
       67
        
           erlangR20_javac = erlangR20.override { javacSupport = true; };

     
···

       69
       69
        
             javacSupport = true;

     

       70
       70
        
             odbcSupport = true;

     

       71
       71
        
           };

     

       72
       72
       -
           erlangR20_nox = erlangR20.override { wxSupport = false; };

     

       73
       72
        
       

     

       74
       73
        
           # R19

     

       75
       74
        
           erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix {

     

       76
       75
        
             wxGTK = wxGTK30;

     

       77
       76
        
             openssl = openssl_1_0_2;

     

       78
       77
        
             autoconf = buildPackages.autoconf269;

     

       78
       78
       +
             inherit wxSupport;

     

       79
       79
        
           };

     

       80
       80
        
           erlangR19_odbc = erlangR19.override { odbcSupport = true; };

     

       81
       81
        
           erlangR19_javac = erlangR19.override { javacSupport = true; };

     
···

       83
       83
        
             javacSupport = true;

     

       84
       84
        
             odbcSupport = true;

     

       85
       85
        
           };

     

       86
       86
       -
           erlangR19_nox = erlangR19.override { wxSupport = false; };

     

       87
       86
        
       

     

       88
       87
        
           # R18

     

       89
       88
        
           erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix {

     

       90
       89
        
             wxGTK = wxGTK30;

     

       91
       90
        
             openssl = openssl_1_0_2;

     

       92
       91
        
             autoconf = buildPackages.autoconf269;

     

       92
       92
       +
             inherit wxSupport;

     

       93
       93
        
           };

     

       94
       94
        
           erlangR18_odbc = erlangR18.override { odbcSupport = true; };

     

       95
       95
        
           erlangR18_javac = erlangR18.override { javacSupport = true; };

     
···

       97
       97
        
             javacSupport = true;

     

       98
       98
        
             odbcSupport = true;

     

       99
       99
        
           };

     

       100
       100
       -
           erlangR18_nox = erlangR18.override { wxSupport = false; };

     

       101
       100
        
       

     

       102
       101
        
           # Basho fork, using custom builder.

     

       103
       102
        
           erlang_basho_R16B02 =

     

       104
       103
        
             lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix {

     

       105
       104
        
               autoconf = buildPackages.autoconf269;

     

       105
       105
       +
               inherit wxSupport;

     

       106
       106
        
             };

     

       107
       107
        
           erlang_basho_R16B02_odbc =

     

       108
       108
        
             erlang_basho_R16B02.override { odbcSupport = true; };