diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-04-15 01:27:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-15 01:27:05 -0400 |
| commit | 3bff114d95da3c9f1d5a438c61cdc8b422676af3 (patch) | |
| tree | 6aa4f8d35671c609eb6749b6938c9a7e44d9030a /pkgs/tools | |
| parent | cdbcaa56b6dd06d2d7f215ccbcab966a9a902773 (diff) | |
| parent | f89504d06746f50d1b7915ad6b31fc58a3449541 (diff) | |
Merge pull request #24871 from elitak/cross-staging
Various small crossDrv fixes
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/netcat-openbsd/default.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 455937f3a67c8..d87976cbc5e8d 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ++ optional aclSupport acl.crossDrv ++ optional attrSupport attr.crossDrv ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ] - ++ optional (stdenv.ccCross.libc ? libiconv) + ++ optional (stdenv ? ccCross.libc.libiconv) stdenv.ccCross.libc.libiconv.crossDrv; # Prevents attempts of running 'help2man' on cross-built binaries. diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 9933b512006f6..ef539cbb51fdf 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ pkgconfig libbsd ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libbsd ]; + sourceRoot = name; patches = [ "../debian/patches/*.patch" ]; |