Skip to content

Commit

Permalink
nix: simplify conditional overrides for boehmgc and aws-sdk-cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
Mic92 committed Dec 15, 2024
1 parent de27f1f commit 141f00d
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions pkgs/tools/package-management/nix/default.nix
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
{ lib
, config
, stdenv
, aws-sdk-cpp
, boehmgc
, callPackage
, fetchFromGitHub
, fetchpatch2
, runCommand
, buildPackages
, Security

, storeDir ? "/nix/store"
, stateDir ? "/nix/var"
, confDir ? "/etc"
}:
let
boehmgc-nix_2_3 = boehmgc.override { enableLargeConfig = true; };

boehmgc-nix = boehmgc-nix_2_3.overrideAttrs (drv: {
boehmgc-nix = boehmgc.override {
enableLargeConfig = true;
}.overrideAttrs (drv: {
patches = (drv.patches or [ ]) ++ [
# Part of the GC solution in https://github.com/NixOS/nix/pull/4944
./patches/boehmgc-coroutine-sp-fallback.patch
Expand Down Expand Up @@ -90,7 +88,7 @@ let
{
inherit Security storeDir stateDir confDir;
boehmgc = boehmgc-nix;
aws-sdk-cpp = if lib.versionAtLeast args.version "2.12pre" then aws-sdk-cpp-nix else aws-sdk-cpp-old-nix;
aws-sdk-cpp = aws-sdk-cpp-nix;
};

# https://github.com/NixOS/nix/pull/7585
Expand Down Expand Up @@ -142,7 +140,10 @@ in lib.makeExtensible (self: ({
];
self_attribute_name = "nix_2_3";
maintainers = with lib.maintainers; [ flokli ];
}).override { boehmgc = boehmgc-nix_2_3; }).overrideAttrs {
}).override {
boehmgc = boehmgc.override { enableLargeConfig = true; };
aws-sdk-cpp = aws-sdk-cpp-old-nix;
}).overrideAttrs {
# https://github.com/NixOS/nix/issues/10222
# spurious test/add.sh failures
enableParallelChecking = false;
Expand Down

0 comments on commit 141f00d

Please sign in to comment.