From 2d33d5c7783ee46320d7776ff33dac5b3887d523 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Tue, 3 Sep 2024 22:57:51 +0300 Subject: [PATCH 1/4] buildDotnetModule: inherit enableParallelBuilding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After this change, enableParallelBuilding defaults to true for packages using buildDotnetModule. The argument value already defaults to true, but we did not use it. Note that default values in Nix are not present in the arguments attribute set, e.g. `args` does not contain `def` for `{ def ? true }@args: …` function unless this argument is explicitly passed. --- pkgs/build-support/dotnet/build-dotnet-module/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 418c90c64899..e36e339dfa7f 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -147,6 +147,8 @@ let dotnetUseAppHost = useAppHost; inherit useDotnetFromEnv; + inherit enableParallelBuilding; + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ dotnetConfigureHook dotnetBuildHook From 699b182349e62582ce230c5b75a14ee2782ce50a Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Wed, 4 Sep 2024 00:15:31 +0300 Subject: [PATCH 2/4] recyclarr: disable parallel building --- pkgs/by-name/re/recyclarr/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/re/recyclarr/package.nix b/pkgs/by-name/re/recyclarr/package.nix index 1ec4192bdd9c..2890f988870c 100644 --- a/pkgs/by-name/re/recyclarr/package.nix +++ b/pkgs/by-name/re/recyclarr/package.nix @@ -40,6 +40,8 @@ buildDotnetModule (finalAttrs: { ''; patches = [ ./001-Git-Version.patch ]; + enableParallelBuilding = false; + dotnetRestoreFlags = [ "--configfile=${nuget-config}" ]; doCheck = false; From 4b61c573e2ba83babdc7e288458bc1fca51f1680 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Wed, 4 Sep 2024 00:15:45 +0300 Subject: [PATCH 3/4] nexusmods-app: disable parallel building --- pkgs/by-name/ne/nexusmods-app/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 03784eeb34c3..68f5dadc393a 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -25,6 +25,8 @@ buildDotnetModule (finalAttrs: { hash = "sha256-FzQphMhiC1g+6qmk/R1v4rq2ldy35NcaWm0RR1UlwLA="; }; + enableParallelBuilding = false; + # If the whole solution is published, there seems to be a race condition where # it will sometimes publish the wrong version of a dependent assembly, for # example: Microsoft.Extensions.Hosting.dll 6.0.0 instead of 8.0.0. From 583270c8efbf87a8808a60d85ac2be625a6e66d7 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Wed, 4 Sep 2024 00:15:55 +0300 Subject: [PATCH 4/4] ryujinx: disable parallel building --- pkgs/by-name/ry/ryujinx/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix index 526c44c3312b..590b7cfc7cce 100644 --- a/pkgs/by-name/ry/ryujinx/package.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -35,6 +35,8 @@ buildDotnetModule rec { sha256 = "1v8j9l2r9sz9s3jhakr3rc50hf6fbdr5cqdrjidjwvziykfckizk"; }; + enableParallelBuilding = false; + dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0;