DGNum/liminix
14
0
Fork 2
Code Issues 15 Pull requests 7 Projects Releases Packages Wiki Activity Actions

refactor: inline definition

Browse source
This commit is contained in:
Daniel Barlow 2023-04-22 23:03:36 +01:00
parent 3feb8eb5f9
commit 245bf534e6
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
overlay.nix
View file

@ -15,18 +15,20 @@ 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: s6 = prev.s6.overrideAttrs(o:
let patch = fetchpatch { let
patch = 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=";
}; };
config = builtins.filter
(x: (builtins.match ".*shared.*" x) == null)
o.configureFlags;
patch_needed = builtins.compareVersions o.version "2.11.1.2" <= 0; patch_needed = builtins.compareVersions o.version "2.11.1.2" <= 0;
in { in {
configureFlags = config ++ [ configureFlags = (builtins.filter
(x: (builtins.match ".*shared.*" x) == null)
o.configureFlags) ++
[
"--disable-allstatic" "--disable-allstatic"
"--disable-static" "--disable-static"
"--enable-shared" "--enable-shared"