commit
206440c611
|
@ -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 \
|
||||||
|
|
Loading…
Reference in New Issue