linuxhackerman
/
liminix
forked from dan/liminix
1
0
Fork 0
Code Pull Requests Activity

build s6 with shared libraries

This commit is contained in:
Daniel Barlow 2023-04-19 21:44:06 +01:00
parent 99af416e14
commit c6b8a8488f
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
overlay.nix
View File

@ -12,6 +12,27 @@ let
builtins.filter (x: (builtins.match "(PLAT|MYLIBS).*" x) == null) builtins.filter (x: (builtins.match "(PLAT|MYLIBS).*" x) == null)
o.makeFlags; o.makeFlags;
}); });
s6 = prev.s6.overrideAttrs(o:
let patch = fetchpatch {
# add "p" directive in s6-log
url = "https://github.com/skarnet/s6/commit/ddc76841398dfd5e18b22943727ad74b880236d3.patch";
hash = "sha256-fBtUinBdp5GqoxgF6fcR44Tu8hakxs/rOShhuZOgokc=";
};
config = builtins.filter
(x: (builtins.match ".*shared.*" x) == null)
o.configureFlags;
patch_needed = builtins.compareVersions o.version "2.11.1.2" <= 0;
in {
configureFlags = config ++ [
"--disable-allstatic"
"--disable-static"
"--enable-shared"
];
stripAllList = [ "sbin" "bin" ];
patches =
(if o ? patches then o.patches else []) ++
(if patch_needed then [ patch ] else []);
});
in in
extraPkgs // { extraPkgs // {
mtdutils = prev.mtdutils.overrideAttrs(o: { mtdutils = prev.mtdutils.overrideAttrs(o: {
@ -62,18 +83,17 @@ extraPkgs // {
luaSmall = let s = lua_no_readline.override { self = s; }; in s; luaSmall = let s = lua_no_readline.override { self = s; }; in s;
s6 = prev.s6.overrideAttrs(o: inherit s6;
let patch = fetchpatch { s6-linux-init = prev.s6-linux-init.override {
# add "p" directive in s6-log skawarePackages = prev.skawarePackages // {
url = "https://github.com/skarnet/s6/commit/ddc76841398dfd5e18b22943727ad74b880236d3.patch"; inherit s6;
hash = "sha256-fBtUinBdp5GqoxgF6fcR44Tu8hakxs/rOShhuZOgokc="; };
}; };
patch_needed = builtins.compareVersions o.version "2.11.1.2" <= 0; s6-rc = prev.s6-rc.override {
in { skawarePackages = prev.skawarePackages // {
patches = inherit s6;
(if o ? patches then o.patches else []) ++ };
(if patch_needed then [ patch ] else []); };
});
nftables = prev.nftables.overrideAttrs(o: { nftables = prev.nftables.overrideAttrs(o: {
configureFlags = [ configureFlags = [