philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge pull request #125678 from alyssais/nix-comment 

nix: clarify config.nix hack
master
Florian Klink 2021-06-08 16:46:50 +02:00 committed by GitHub
parent 6436dd3442 42b211f175
commit 206440c611
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/package-management/nix/default.nix
View File

@ -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 \