diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-10-15 13:04:42 -0400 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:44:27 -0600 |
| commit | 46c2e619e856ad679ae41005e8ba2a9dac39ff77 (patch) | |
| tree | 0522fe1c0261702f2d0cb2f4bcc5c546471047db /pkgs/os-specific/linux/pam/default.nix | |
| parent | 47540dab74224bb94ebb8c8a327391b5bd45e960 (diff) | |
| download | nixpkgs-46c2e619e856ad679ae41005e8ba2a9dac39ff77.tar nixpkgs-46c2e619e856ad679ae41005e8ba2a9dac39ff77.tar.gz nixpkgs-46c2e619e856ad679ae41005e8ba2a9dac39ff77.tar.bz2 nixpkgs-46c2e619e856ad679ae41005e8ba2a9dac39ff77.tar.lz nixpkgs-46c2e619e856ad679ae41005e8ba2a9dac39ff77.tar.xz nixpkgs-46c2e619e856ad679ae41005e8ba2a9dac39ff77.tar.zst nixpkgs-46c2e619e856ad679ae41005e8ba2a9dac39ff77.zip | |
linux-pam: Add necessary build dependencies for cross-compilation
Ensure that we use the correct `ar` and add explicit dependency on the build CC. (cherry picked from commit 5efb768011f6bce870f4ce814295a399d5a89c10)
Diffstat (limited to 'pkgs/os-specific/linux/pam/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 3de7916bff6..fc2a7ea61d2 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, cracklib }: +{ stdenv, buildPackages, fetchurl, flex, cracklib }: stdenv.mkDerivation rec { name = "linux-pam-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" "man" /* "modules" */ ]; - nativeBuildInputs = [ flex ]; + nativeBuildInputs = [ buildPackages.stdenv.cc flex ]; buildInputs = [ cracklib ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { crossAttrs = { propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ]; preConfigure = preConfigure + '' - ar x ${flex.crossDrv}/lib/libfl.a + $crossConfig-ar x ${flex.crossDrv}/lib/libfl.a mv libyywrap.o libyywrap-target.o ar x ${flex}/lib/libfl.a mv libyywrap.o libyywrap-host.o |