diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-29 16:48:24 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-02 15:01:58 -0400 |
commit | 34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5 (patch) | |
tree | c8745f7e51296fe44c6a04927c1c60b040bbab84 /pkgs/os-specific/linux/iputils/default.nix | |
parent | 89a89ddfb3665561a3410420634ada773dfea691 (diff) | |
download | nixpkgs-34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5.tar nixpkgs-34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5.tar.gz nixpkgs-34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5.tar.bz2 nixpkgs-34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5.tar.lz nixpkgs-34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5.tar.xz nixpkgs-34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5.tar.zst nixpkgs-34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5.zip |
treewide: Remove stdenv.isCross
I *want* cross-specific overrides to be verbose, so I rather not have this shorthand. This makes the syntactic overhead more proportional to the maintainence cost. Hopefully this pushes people towards fewer conditionals and more abstractions.
Diffstat (limited to 'pkgs/os-specific/linux/iputils/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/iputils/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 4caa0acb4b6..3430797666e 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn; # 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"; + buildFlags = "man all" + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) " ninfod"; installPhase = '' |