Compare commits
3 Commits
ad3ef53171
...
c7aa8c7756
Author | SHA1 | Date | |
---|---|---|---|
c7aa8c7756 | |||
c6b8a8488f | |||
99af416e14 |
@ -1,7 +1,6 @@
|
||||
{ config, pkgs, ... }:
|
||||
let
|
||||
inherit (pkgs)
|
||||
busybox
|
||||
execline
|
||||
s6
|
||||
s6-init-bin
|
||||
@ -16,12 +15,11 @@ let
|
||||
name = "s6-scripts";
|
||||
src = ./scripts;
|
||||
phases = ["unpackPhase" "installPhase" ];
|
||||
buildInputs = [busybox];
|
||||
buildInputs = [];
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -r $src $out/scripts
|
||||
chmod -R +w $out
|
||||
patchShebangs $out/scripts
|
||||
'';
|
||||
};
|
||||
service = dir {
|
||||
|
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env sh
|
||||
#!/bin/sh
|
||||
|
||||
rl="$1"
|
||||
shift
|
||||
|
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env sh
|
||||
#!/bin/sh
|
||||
|
||||
|
||||
### Things to do before hardware halt/reboot/poweroff.
|
||||
|
@ -1,4 +1,4 @@
|
||||
#!/nix/store/xbdqbi2mscmhl5wcpbgpjdwxbsrvpkil-bash-5.1-p16/bin/sh -e
|
||||
#!/bin/sh -e
|
||||
|
||||
### Things to do *right before* the machine gets rebooted or
|
||||
### powered off, at the very end of the shutdown sequence,
|
||||
|
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env sh -e
|
||||
#!/bin/sh -e
|
||||
|
||||
### This script is called once at boot time by rc.init, and is
|
||||
### also called by the runleveld service every time the user
|
||||
|
52
overlay.nix
52
overlay.nix
@ -7,11 +7,35 @@ let
|
||||
preBuild = ''
|
||||
makeFlagsArray+=(PLAT="posix" SYSLIBS="-Wl,-E -ldl" CFLAGS="-O2 -fPIC -DLUA_USE_POSIX -DLUA_USE_DLOPEN")
|
||||
'';
|
||||
|
||||
# lua in nixpkgs has a postInstall stanza that assumes only
|
||||
# one output, we need to override that if we're going to
|
||||
# convert to multi-output
|
||||
# outputs = ["bin" "man" "out"];
|
||||
makeFlags =
|
||||
builtins.filter (x: (builtins.match "(PLAT|MYLIBS).*" x) == null)
|
||||
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
|
||||
extraPkgs // {
|
||||
mtdutils = prev.mtdutils.overrideAttrs(o: {
|
||||
@ -20,6 +44,9 @@ extraPkgs // {
|
||||
];
|
||||
});
|
||||
|
||||
# openssl is reqired by ntp
|
||||
|
||||
|
||||
rsyncSmall = prev.rsync.overrideAttrs(o: {
|
||||
configureFlags = o.configureFlags ++ [
|
||||
"--disable-openssl"
|
||||
@ -62,18 +89,17 @@ extraPkgs // {
|
||||
|
||||
luaSmall = let s = lua_no_readline.override { self = s; }; in s;
|
||||
|
||||
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=";
|
||||
};
|
||||
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 []);
|
||||
});
|
||||
inherit s6;
|
||||
s6-linux-init = prev.s6-linux-init.override {
|
||||
skawarePackages = prev.skawarePackages // {
|
||||
inherit s6;
|
||||
};
|
||||
};
|
||||
s6-rc = prev.s6-rc.override {
|
||||
skawarePackages = prev.skawarePackages // {
|
||||
inherit s6;
|
||||
};
|
||||
};
|
||||
|
||||
nftables = prev.nftables.overrideAttrs(o: {
|
||||
configureFlags = [
|
||||
|
Loading…
Reference in New Issue
Block a user