Unverified Commit 6c2492ff authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel Committed by GitHub
Browse files

Merge pull request #289405 from trofi/samba-fix-i686 

pkgsi686Linux.samba: don't configure `waf` in parallel on 32-bit systems
parents ad18cf08 9e38b7b0

pkgs/servers/samba/4.x.nix

+8 −2
Original line number Diff line number Diff line
@@ -165,8 +165,14 @@ stdenv.mkDerivation rec { 
    ++ optional (!enablePam) "--without-pam"

    ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

    "--bundled-libraries=!asn1_compile,!compile_et"

  ] ++ optionals stdenv.isAarch32 [

  ] ++ optionals stdenv.buildPlatform.is32bit [

    # By default `waf configure` spawns as many as available CPUs. On

    # 32-bit systems with many CPUs (like `i686` chroot on `x86_64`

    # kernel) it can easily exhaust 32-bit address space and hang up:

    #   https://github.com/NixOS/nixpkgs/issues/287339#issuecomment-1949462057

    #   https://bugs.gentoo.org/683148

    # Limit the job count down to the minimal on system with limited address

    # space.

    "--jobs 1"

  ];