diff options
author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2021-06-28 11:03:15 -0400 |
---|---|---|
committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2021-06-28 11:07:45 -0400 |
commit | d9ff248390474edc0428d3c87b413a707b3b5223 (patch) | |
tree | 0211e487a3ee75fce3a0794cef1f83175cf2e92b /pkgs/development/libraries/talloc | |
parent | 773369673c7741af55a0a1e675e35c8f3248e1e0 (diff) |
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.
Diffstat (limited to 'pkgs/development/libraries/talloc')
-rw-r--r-- | pkgs/development/libraries/talloc/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 27705c5785847..f37f3d34d4943 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -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"; -}) +} |