thek0tyara/nixos-conf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

maybe i will fix socketed compilation via sccache later

Browse source
This commit is contained in:
TheK0tYaRa 2026-03-09 11:16:12 +02:00
parent 44ddb7f282
commit afb1a63389
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
custom/modules/default.nix
View file

@ -85,6 +85,16 @@ in
}
);
}
{
name = "input";
structuredExtraConfig = (
with lib.kernel;
{
MOUSE_APPLETOUCH = no;
INPUT_TOUCHSCREEN = no;
}
);
}
];
};
}

12
custom/modules/kernel.nix
View file

@ -6,7 +6,7 @@
kernelPatches ? [ ],
extraConfig ? "",
sccacheDir ? "/var/cache/sccache",
sccacheServerUds ? "/run/sccache/server.sock",
sccacheServerUds ? null,
enforceSccache ? true,
}:
@ -63,7 +63,7 @@ pkgs.callPackage (
pkgs.writeShellScriptBin name ''
set -euo pipefail
export SCCACHE_DIR=${lib.escapeShellArg sccacheDir}
export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}
${lib.optionalString (sccacheServerUds != null) "export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}"}
if [ -n "''${SCCACHE_ENFORCE_MARKER-}" ]; then
: > "''${SCCACHE_ENFORCE_MARKER}"
fi
@ -76,7 +76,7 @@ pkgs.callPackage (
rustcSccache = pkgs.writeShellScriptBin "rustc" ''
set -euo pipefail
export SCCACHE_DIR=${lib.escapeShellArg sccacheDir}
export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}
${lib.optionalString (sccacheServerUds != null) "export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}"}
if [ -n "''${SCCACHE_ENFORCE_MARKER-}" ]; then
: > "''${SCCACHE_ENFORCE_MARKER}"
fi
@ -86,7 +86,7 @@ pkgs.callPackage (
hostrustcSccache = pkgs.writeShellScriptBin "rustc" ''
set -euo pipefail
export SCCACHE_DIR=${lib.escapeShellArg sccacheDir}
export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}
${lib.optionalString (sccacheServerUds != null) "export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}"}
if [ -n "''${SCCACHE_ENFORCE_MARKER-}" ]; then
: > "''${SCCACHE_ENFORCE_MARKER}"
fi
@ -139,7 +139,7 @@ pkgs.callPackage (
(args.preBuild or "")
+ lib.optionalString enforceSccache ''
export SCCACHE_DIR=${lib.escapeShellArg sccacheDir}
export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}
${lib.optionalString (sccacheServerUds != null) "export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}"}
'';
buildPhase =
@ -147,7 +147,7 @@ pkgs.callPackage (
''
runHook preBuild
export SCCACHE_DIR=${lib.escapeShellArg sccacheDir}
export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}
${lib.optionalString (sccacheServerUds != null) "export SCCACHE_SERVER_UDS=${lib.escapeShellArg sccacheServerUds}"}
export SCCACHE_ENFORCE_MARKER="$NIX_BUILD_TOP/.sccache-used"
rm -f "$SCCACHE_ENFORCE_MARKER"
make "''${makeFlags[@]}" "''${buildFlags[@]}"