diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-20 14:43:41 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-30 17:20:32 -0400 |
| commit | 0828e2d8c369604c56219bd7085256b984087280 (patch) | |
| tree | 507e0429674ad3a42bf5dcd11413d3c834f95c74 /pkgs/os-specific/bsd | |
| parent | 2c2f1e37d4374ea61caefd9389927ea03df4ce31 (diff) | |
| download | nixlib-0828e2d8c369604c56219bd7085256b984087280.tar nixlib-0828e2d8c369604c56219bd7085256b984087280.tar.gz nixlib-0828e2d8c369604c56219bd7085256b984087280.tar.bz2 nixlib-0828e2d8c369604c56219bd7085256b984087280.tar.lz nixlib-0828e2d8c369604c56219bd7085256b984087280.tar.xz nixlib-0828e2d8c369604c56219bd7085256b984087280.tar.zst nixlib-0828e2d8c369604c56219bd7085256b984087280.zip | |
treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated thereafter.
Diffstat (limited to 'pkgs/os-specific/bsd')
| -rw-r--r-- | pkgs/os-specific/bsd/netbsd/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index e31d6fea378e..2d1909547b61 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, hostPlatform, fetchcvs, lib, groff, mandoc, zlib, buildPackages +{ stdenv, fetchcvs, lib, groff, mandoc, zlib, buildPackages , yacc, flex, libressl, bash, less, writeText }: let @@ -32,8 +32,8 @@ let MKUNPRIVED = "yes"; HOST_SH = "${bash}/bin/sh"; OBJCOPY = if stdenv.isDarwin then "true" else "objcopy"; - MACHINE_ARCH = hostPlatform.parsed.cpu.name; - MACHINE_CPU = hostPlatform.parsed.cpu.name; + MACHINE_ARCH = stdenv.hostPlatform.parsed.cpu.name; + MACHINE_CPU = stdenv.hostPlatform.parsed.cpu.name; INSTALL_FILE = "install -U -c"; INSTALL_DIR = "xinstall -U -d"; @@ -478,7 +478,7 @@ in rec { "-DOXTABS=XTABS" "-DRANDOM_MAX=RAND_MAX" "-DINFTIM=-1" - (lib.optionalString hostPlatform.isMusl "-include sys/ttydefaults.h -include sys/file.h") + (lib.optionalString stdenv.hostPlatform.isMusl "-include sys/ttydefaults.h -include sys/file.h") "-DBE32TOH(x)=((void)0)" "-DBE64TOH(x)=((void)0)" "-D__c99inline=__inline" |