From e9b95509b20f328e25e6b5123248cd22b9a6d245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 13 Apr 2025 23:18:38 +0200 Subject: [PATCH] stub-ld: disable 32-bit stub ld on 64-bit systems This pulls in another instance of nixpkgs including glibc. This is both not great from a evaluation perspective and a dependency closure. So let's remove this part from nixpkgs again and re-enable it, when we have slimmed down the build according to `environment.ldso32 = mkIf pkgs.stdenv.hostPlatform.isx86_64 (mkDefault stub-ld32);` --- nixos/modules/config/stub-ld.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/modules/config/stub-ld.nix b/nixos/modules/config/stub-ld.nix index 836cd129e22f..277ed7594566 100644 --- a/nixos/modules/config/stub-ld.nix +++ b/nixos/modules/config/stub-ld.nix @@ -42,10 +42,7 @@ let $CC -Os main.c -o $out ''; - pkgs32 = pkgs.pkgsi686Linux; - stub-ld = stub-ld-for pkgs message; - stub-ld32 = stub-ld-for pkgs32 message; in { options = { @@ -65,7 +62,6 @@ in config = mkIf cfg.enable { environment.ldso = mkDefault stub-ld; - environment.ldso32 = mkIf pkgs.stdenv.hostPlatform.isx86_64 (mkDefault stub-ld32); }; meta.maintainers = with lib.maintainers; [ tejing ];