diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-12-14 16:56:03 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 16:56:03 -0600 |
| commit | 079535f0dfef8ac9e1d79de250b077bd6bcd89a0 (patch) | |
| tree | b8ebed38d66c579af38f292940ce4e87595fee09 /pkgs | |
| parent | dd95aa337e23a8a48fe82f0f7b1cced8bc03e379 (diff) | |
| parent | 46224b1e19343f01885b06bd0df07dfac8e32fc4 (diff) | |
| download | nixpkgs-079535f0dfef8ac9e1d79de250b077bd6bcd89a0.tar nixpkgs-079535f0dfef8ac9e1d79de250b077bd6bcd89a0.tar.gz nixpkgs-079535f0dfef8ac9e1d79de250b077bd6bcd89a0.tar.bz2 nixpkgs-079535f0dfef8ac9e1d79de250b077bd6bcd89a0.tar.lz nixpkgs-079535f0dfef8ac9e1d79de250b077bd6bcd89a0.tar.xz nixpkgs-079535f0dfef8ac9e1d79de250b077bd6bcd89a0.tar.zst nixpkgs-079535f0dfef8ac9e1d79de250b077bd6bcd89a0.zip | |
Merge pull request #106761 from Atemu/fix/cifs-utils-cross
cifs-utils: don't check for AC_FUNC_MALLOC when cross compiling
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/cifs-utils/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index ad136b811df..11544d94666 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, docutils, pkgconfig +{ stdenv, lib, fetchurl, autoreconfHook, docutils, pkgconfig , kerberos, keyutils, pam, talloc }: stdenv.mkDerivation rec { @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { buildInputs = [ kerberos keyutils pam talloc ]; + configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # AC_FUNC_MALLOC is broken on cross builds. + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + makeFlags = [ "root_sbindir=$(out)/sbin" ]; meta = with stdenv.lib; { |