JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iputils: Fix cross compile

Browse Source
This commit is contained in:
Shea Levy 2018-02-27 18:11:17 -05:00
parent 1f2701379a
commit 0221112542
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/os-specific/linux/iputils/default.nix
View File

@ -24,16 +24,21 @@ stdenv.mkDerivation rec {
# Disable idn usage w/musl: https://github.com/iputils/iputils/pull/111
makeFlags = [ "USE_GNUTLS=no" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "USE_IDN=no";
depsBuildBuild = [ opensp SGMLSpm docbook_sgml_dtd_31 ];
buildInputs = [
libsysfs opensp openssl libcap docbook_sgml_dtd_31 SGMLSpm libgcrypt nettle
libsysfs openssl libcap libgcrypt nettle
] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn;
buildFlags = "man all ninfod";
# ninfod probably could build on cross, but the Makefile doesn't pass --host etc to the sub configure...
buildFlags = "man all" + stdenv.lib.optionalString (!stdenv.isCross) " ninfod";
installPhase =
''
mkdir -p $out/bin
cp -p ping tracepath clockdiff arping rdisc ninfod/ninfod $out/bin/
cp -p ping tracepath clockdiff arping rdisc $out/bin/
if [ -x ninfod/ninfod ]; then
cp -p ninfod/ninfod $out/bin
fi
mkdir -p $out/share/man/man8
cp -p \

2
pkgs/top-level/all-packages.nix
View File

@ -12994,7 +12994,7 @@ with pkgs;
iproute = callPackage ../os-specific/linux/iproute { };
iputils = callPackage ../os-specific/linux/iputils {
inherit (perlPackages) SGMLSpm;
inherit (buildPackages.buildPackages.perlPackages) SGMLSpm;
};
iptables = callPackage ../os-specific/linux/iptables { };