refactor: inline definition
This commit is contained in:
parent
3feb8eb5f9
commit
245bf534e6
1 changed files with 12 additions and 10 deletions
22
overlay.nix
22
overlay.nix
|
@ -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
|
||||||
# add "p" directive in s6-log
|
patch = fetchpatch {
|
||||||
url = "https://github.com/skarnet/s6/commit/ddc76841398dfd5e18b22943727ad74b880236d3.patch";
|
# add "p" directive in s6-log
|
||||||
hash = "sha256-fBtUinBdp5GqoxgF6fcR44Tu8hakxs/rOShhuZOgokc=";
|
url = "https://github.com/skarnet/s6/commit/ddc76841398dfd5e18b22943727ad74b880236d3.patch";
|
||||||
};
|
hash = "sha256-fBtUinBdp5GqoxgF6fcR44Tu8hakxs/rOShhuZOgokc=";
|
||||||
config = builtins.filter
|
};
|
||||||
(x: (builtins.match ".*shared.*" x) == null)
|
patch_needed = builtins.compareVersions o.version "2.11.1.2" <= 0;
|
||||||
o.configureFlags;
|
|
||||||
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"
|
||||||
|
|
Loading…
Reference in a new issue