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

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.
master
Alyssa Ross 2021-06-04 13:32:02 +00:00
parent f36a65f6e2
commit 42b211f175
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
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.* patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
''} ''}
'' + '' +
# On all versions before c9f51e87057652db0013289a95deffba495b35e7, # On all versions before c9f51e87057652db0013289a95deffba495b35e7, which
# released with 2.3.8, we need to patch around an issue where the Nix # removes config.nix entirely and is not present in 2.3.x, we need to
# configure step pulls in the build system's bash and other utilities # patch around an issue where the Nix configure step pulls in the build
# when cross-compiling. # system's bash and other utilities when cross-compiling.
lib.optionalString ( lib.optionalString (
stdenv.buildPlatform != stdenv.hostPlatform && stdenv.buildPlatform != stdenv.hostPlatform && !is24
(lib.versionOlder "2.3.8" version && !is24)
# The additional is24 condition is required as versionOlder doesn't understand nixUnstable version strings
) '' ) ''
mkdir tmp/ mkdir tmp/
substitute corepkgs/config.nix.in tmp/config.nix.in \ substitute corepkgs/config.nix.in tmp/config.nix.in \