From d11f290f670d04071f893deea891a373e1548821 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 28 Apr 2018 01:31:06 +0000 Subject: [PATCH] netbsd: cleanup and musl suppot --- pkgs/os-specific/bsd/netbsd/default.nix | 29 ++++++++++++------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index f9c8653447fe..0cd2b4ffc6e8 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -405,6 +405,7 @@ in rec { "-DOXTABS=XTABS" "-DRANDOM_MAX=RAND_MAX" "-DINFTIM=-1" + (if hostPlatform.isMusl then "-include sys/ttydefaults.h -include sys/file.h" else "") ]; postBuild = '' mkdir -p $out/usr/games $out/usr/share/games/ching \ @@ -424,21 +425,19 @@ in rec { ]; }; - finger = netBSDDerivation { - path = "usr.bin/finger"; - sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; - version = "7.1.2"; - extraPaths = [ who.src ]; - NIX_CFLAGS_COMPILE = [ - "-DSUPPORT_UTMP" - "-USUPPORT_UTMPX" - ]; - patchPhase = '' - - ${who.patchPhase} - - ''; - }; + # finger = netBSDDerivation { + # path = "usr.bin/finger"; + # sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi"; + # version = "7.1.2"; + # extraPaths = [ who.src ]; + # NIX_CFLAGS_COMPILE = [ + # "-DSUPPORT_UTMP" + # "-USUPPORT_UTMPX" + # ]; + # patchPhase = '' + # ${who.patchPhase} + # ''; + # }; fingerd = netBSDDerivation { path = "libexec/fingerd";