diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-05-09 18:41:48 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-05-15 16:47:16 +0200 |
commit | 67641d0589ea6a3ab821cae0278fc2c013940a3a (patch) | |
tree | 12989ba487a6a8e63b19733488b78401c35b1da7 /pkgs/servers/samba | |
parent | 0fd0a8bac10faa9d6e2f3c39ef4b817445311df9 (diff) |
wafHook: don't add cross compilation flags
These flags are not part of waf, they're custom flags that are not widely implemented. More packages are broken because of these flags being added than actually recognise them. Of the packages in Nixpkgs that directly depend on wafHook that we can attempt to cross compile (i.e. all their dependencies cross compile), 5 already successfully cross compile and recognise these flags, 2 already successfully cross compile because they have been opted out of these flags, 3 don't cross compile successfully for reasons unrelated to these flags, and for the remaining 7, the only thing stopping them cross compiling successfully is that they are being passed these flags that they don't recognise. All of the five successfully cross-compiling packages that do recognise these flags are samba projects: ldb, talloc, tdb, tevent, and samba4. So this isn't a general waf convention, just a samba one. It therefore doesn't make sense to set these flags by default. They should just be included in the expressions for each samba project, like all the other quirks common to samba build systems. This change fixes cross compilation of the following packages: blockhash ganv ndn-cxx mda_lv2 pflask raul saldl
Diffstat (limited to 'pkgs/servers/samba')
-rw-r--r-- | pkgs/servers/samba/4.x.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index a52099460e780..ee37db169bbb4 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -173,6 +173,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optional (!enablePam) "--without-pam" ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--bundled-libraries=!asn1_compile,!compile_et" + "--cross-compile" + "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ] ++ optionals stdenv.buildPlatform.is32bit [ # By default `waf configure` spawns as many as available CPUs. On # 32-bit systems with many CPUs (like `i686` chroot on `x86_64` |