talloc: remove special case for cross-compiling

Setting PYTHON_CONFIG = "/invalid" works for native builds as well, so we can
avoid special-casing cross builds.
This commit is contained in:
Ben Wolsieffer 2021-06-28 11:03:15 -04:00
parent 773369673c
commit d9ff248390

View file

@ -10,7 +10,7 @@
, wafHook
}:
stdenv.mkDerivation (rec {
stdenv.mkDerivation rec {
pname = "talloc";
version = "2.3.2";
@ -42,6 +42,11 @@ stdenv.mkDerivation (rec {
"--builtin-libraries=replace"
];
# python-config from build Python gives incorrect values when cross-compiling.
# If python-config is not found, the build falls back to using the sysconfig
# module, which works correctly in all cases.
PYTHON_CONFIG = "/invalid";
# this must not be exported before the ConfigurePhase otherwise waf whines
preBuild = lib.optionalString stdenv.hostPlatform.isMusl ''
export NIX_CFLAGS_LINK="-no-pie -shared";
@ -57,9 +62,4 @@ stdenv.mkDerivation (rec {
license = licenses.gpl3;
platforms = platforms.all;
};
} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
# python-config from build Python gives incorrect values when cross-compiling.
# If python-config is not found, the build falls back to using the sysconfig
# module, which works correctly when cross-compiling.
PYTHON_CONFIG = "/invalid";
})
}