JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openbsd: remove

Browse Source
This commit is contained in:
Matthew Bauer 2018-04-28 01:03:34 +00:00
parent c65000af91
commit 6bc19398be
3 changed files with 1 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/bsd/default.nix
View File

@ -2,7 +2,4 @@
rec { rec {
netbsd = recurseIntoAttrs (callPackages ./netbsd {}); netbsd = recurseIntoAttrs (callPackages ./netbsd {});
openbsd = recurseIntoAttrs (callPackages ./openbsd {
inherit (netbsd) compat netBSDDerivation libcurses libterminfo;
});
} }

48
pkgs/os-specific/bsd/openbsd/default.nix
View File

@ -1,48 +0,0 @@
{ fetchcvs, netBSDDerivation, compat, libcurses, libterminfo }:
let
fetchOpenBSD = path: version: sha256: fetchcvs {
cvsRoot = "anoncvs@anoncvs.ca.openbsd.org:/cvs";
module = "src/${path}";
inherit sha256;
tag = "OPENBSD_${builtins.replaceStrings ["."] ["_"] version}";
};
# OpenBSD is a fork of NetBSD
# We can build it with minimal changes
openBSDDerivation = attrs: netBSDDerivation (attrs // {
name = "${attrs.pname or (baseNameOf attrs.path)}-openbsd-${attrs.version}";
src = fetchOpenBSD attrs.path attrs.version attrs.sha256;
});
in {
mg = openBSDDerivation {
path = "usr.bin/mg";
version = "6.3";
sha256 = "0n3hwa81c2mcjwbmidrbvi1l25jh8hy939kqrigbv78jixpynffc";
buildInputs = [ compat libcurses libterminfo ];
patchPhase = ''
NIX_CFLAGS_COMPILE+=" -I$BSDSRCDIR/sys"
substituteInPlace fileio.c \
--replace "bp->b_fi.fi_mtime.tv_sec != sb.st_mtimespec.tv_sec" "bp->b_fi.fi_mtime.tv_sec != sb.st_mtim.tv_sec" \
--replace "bp->b_fi.fi_mtime.tv_nsec != sb.st_mtimespec.tv_nsec" "bp->b_fi.fi_mtime.tv_nsec != sb.st_mtim.tv_nsec" \
--replace "bp->b_fi.fi_mtime = sb.st_mtimespec" "bp->b_fi.fi_mtime = sb.st_mtim"
substituteInPlace Makefile \
--replace "-o root -g wheel" "" \
--replace '-o ''${DOCOWN} -g ''${DOCGRP}' ""
'';
NIX_CFLAGS_COMPILE = [ "-DTCSASOFT=0x10" "-Dpledge(a,b)=0" ];
preBuild = ''
cc -c $BSDSRCDIR/lib/libc/stdlib/strtonum.c -o strtonum.o
NIX_LDFLAGS+=" strtonum.o"
'';
extraPaths = [
(fetchOpenBSD "sys/sys/tree.h" "6.3" "0rimh41wn9wz5m510zk9i27z3s450qqgq2k5xn8kp3885hygbcj9")
(fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr")
(fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr")
(fetchOpenBSD "lib/libc/stdlib/strtonum.c" "6.3" "0xn3qxvb3g76hz698sjkf85p07zrcdv2g31inp8caqw2mpk6jadv")
];
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -21379,5 +21379,5 @@ with pkgs;
mount wall hostname more sysctl; mount wall hostname more sysctl;
inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { })) inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { }))
netbsd openbsd; netbsd;
} }