Author: ludo
Date: Tue Nov 23 22:10:37 2010
New Revision: 24831
URL: https://svn.nixos.org/websvn/nix/?rev=24831&sc=1
Log:
inetutils: Restrict dependency on net-tools to Linux-based systems.
Modified:
hydra-config/gnu/trunk/inetutils/release.nix
Modified: hydra-config/gnu/trunk/inetutils/release.nix
==============================================================================
--- hydra-config/gnu/trunk/inetutils/release.nix Tue Nov 23 21:34:45
2010 (r24830)
+++ hydra-config/gnu/trunk/inetutils/release.nix Tue Nov 23 22:10:37
2010 (r24831)
@@ -43,9 +43,11 @@
inherit (pkgs) releaseTools;
buildInputsFrom = pkgs: with pkgs;
+ [ ncurses shishi ] ++
+
# Ironically, net-tools is needed to run the tests, which expect
# `netstat'.
- [ ncurses shishi nettools ];
+ (lib.optional stdenv.isLinux nettools);
jobs = rec {
@@ -95,7 +97,8 @@
pkgs.releaseTools.nixBuild {
name = "inetutils";
src = tarball;
- buildInputs = [ pkgs.ncurses pkgs.nettools ];
+ buildInputs = [ pkgs.ncurses ]
+ ++ (pkgs.lib.optional pkgs.stdenv.isLinux pkgs.nettools);
configureFlags =
[ "--with-ncurses-include-dir=${pkgs.ncurses}/include" ];
inherit preBuild meta;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
