From 42b211f1756d115ca8f52f228f7df8cc40f7703d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 4 Jun 2021 13:32:02 +0000 Subject: [PATCH] nix: clarify config.nix hack The comment said that this was needed for Nix <2.3.8, which is wrong -- it's needed for all 2.3.x. I think this must have been caused by a nmisreading of the conditional, which applied to all versions _later_ than 2.3.8, not earlier. But we don't package anything that old any more, so we can remove that check entirely, in addition to clarifying the comment. --- pkgs/tools/package-management/nix/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5f139a1b3b9..a7b3d12f7a5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -93,14 +93,12 @@ common = patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* ''} '' + - # On all versions before c9f51e87057652db0013289a95deffba495b35e7, - # released with 2.3.8, we need to patch around an issue where the Nix - # configure step pulls in the build system's bash and other utilities - # when cross-compiling. + # On all versions before c9f51e87057652db0013289a95deffba495b35e7, which + # removes config.nix entirely and is not present in 2.3.x, we need to + # patch around an issue where the Nix configure step pulls in the build + # system's bash and other utilities when cross-compiling. lib.optionalString ( - stdenv.buildPlatform != stdenv.hostPlatform && - (lib.versionOlder "2.3.8" version && !is24) - # The additional is24 condition is required as versionOlder doesn't understand nixUnstable version strings + stdenv.buildPlatform != stdenv.hostPlatform && !is24 ) '' mkdir tmp/ substitute corepkgs/config.nix.in tmp/config.nix.in \