jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nix: fix closure bloat on nix

Browse Source 
The conditional preventing closure bloat unfortunately didn't apply for
the `nix` attribute, which is at 2.3.10 (not 2.4.*, what this did check
for).

Due to the somewhat funny 2.4pre* version strings used for nixUnstable
not being understood by lib.versionOlder, we also need to explicitly add
a check for that.
This commit is contained in:
Florian Klink 2020-12-31 19:48:42 +01:00
parent d5a1138049
commit 31999436da
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,6 @@ common =
version = lib.getVersion name; version = lib.getVersion name;
is24 = lib.versionAtLeast version "2.4pre"; is24 = lib.versionAtLeast version "2.4pre";
isExactly24 = lib.versionAtLeast version "2.4" && lib.versionOlder version "2.4";
VERSION_SUFFIX = suffix; VERSION_SUFFIX = suffix;
@ -93,9 +92,15 @@ 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.*
''} ''}
'' + '' +
# For Nix 2.4, patch around an issue where the Nix configure step pulls in the # On all versions before c9f51e87057652db0013289a95deffba495b35e7,
# build system's bash and other utilities when cross-compiling # released with 2.3.8, we need to patch around an issue where the Nix
lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly24) '' # 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" (lib.traceVal 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 \
--subst-var-by bash ${bash}/bin/bash \ --subst-var-by bash ${bash}/bin/bash \