diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-04-28 01:31:06 +0000 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-04-28 01:31:12 +0000 |
| commit | d11f290f670d04071f893deea891a373e1548821 (patch) | |
| tree | d4926f78c2df8a2e1849f45a2553ca89f1968420 /pkgs/os-specific/bsd | |
| parent | 004111c27e11684d6945f82124110c5f17c1bf01 (diff) | |
| download | nixpkgs-d11f290f670d04071f893deea891a373e1548821.tar nixpkgs-d11f290f670d04071f893deea891a373e1548821.tar.gz nixpkgs-d11f290f670d04071f893deea891a373e1548821.tar.bz2 nixpkgs-d11f290f670d04071f893deea891a373e1548821.tar.lz nixpkgs-d11f290f670d04071f893deea891a373e1548821.tar.xz nixpkgs-d11f290f670d04071f893deea891a373e1548821.tar.zst nixpkgs-d11f290f670d04071f893deea891a373e1548821.zip | |
netbsd: cleanup and musl suppot
Diffstat (limited to 'pkgs/os-specific/bsd')
| -rw-r--r-- | pkgs/os-specific/bsd/netbsd/default.nix | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index f9c8653447f..0cd2b4ffc6e 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"; |