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:
parent
773369673c
commit
d9ff248390
|
@ -10,7 +10,7 @@
|
||||||
, wafHook
|
, wafHook
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation (rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "talloc";
|
pname = "talloc";
|
||||||
version = "2.3.2";
|
version = "2.3.2";
|
||||||
|
|
||||||
|
@ -42,6 +42,11 @@ stdenv.mkDerivation (rec {
|
||||||
"--builtin-libraries=replace"
|
"--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
|
# this must not be exported before the ConfigurePhase otherwise waf whines
|
||||||
preBuild = lib.optionalString stdenv.hostPlatform.isMusl ''
|
preBuild = lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||||
export NIX_CFLAGS_LINK="-no-pie -shared";
|
export NIX_CFLAGS_LINK="-no-pie -shared";
|
||||||
|
@ -57,9 +62,4 @@ stdenv.mkDerivation (rec {
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
platforms = platforms.all;
|
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";
|
|
||||||
})
|
|
||||||
|
|
Loading…
Reference in a new issue