lbailly/liminix
1
0
Fork 0
forked from DGNum/liminix
Code Pull requests 2 Activity Actions

don't patch s6 if new enough not to need it

Browse source
This commit is contained in:
Daniel Barlow 2023-03-06 17:49:11 +00:00
parent 1565a8414d
commit aa5f8c07e6
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
overlay.nix
View file

@ -4,14 +4,18 @@ in
extraPkgs // { extraPkgs // {
strace = prev.strace.override { libunwind = null; }; strace = prev.strace.override { libunwind = null; };
s6 = prev.s6.overrideAttrs(o: { s6 = prev.s6.overrideAttrs(o:
patches = let patch = final.fetchpatch {
(if o ? patches then o.patches else []) ++ [
(final.fetchpatch {
# add "p" directive in s6-log # add "p" directive in s6-log
url = "https://github.com/skarnet/s6/commit/ddc76841398dfd5e18b22943727ad74b880236d3.patch"; url = "https://github.com/skarnet/s6/commit/ddc76841398dfd5e18b22943727ad74b880236d3.patch";
hash = "sha256-fBtUinBdp5GqoxgF6fcR44Tu8hakxs/rOShhuZOgokc="; hash = "sha256-fBtUinBdp5GqoxgF6fcR44Tu8hakxs/rOShhuZOgokc=";
})]; };
patch_needed = builtins.compareVersions o.version "2.11.1.2" <= 0;
in {
patches =
(if o ? patches then o.patches else []) ++
(if patch_needed then [ patch ] else []);
});
}); });
dnsmasq = dnsmasq =