From afb1a63389643cabedf65d7153adb9199acada76 Mon Sep 17 00:00:00 2001 From: TheK0tYaRa Date: Mon, 9 Mar 2026 11:16:12 +0200 Subject: [PATCH] maybe i will fix socketed compilation via sccache later --- custom/modules/default.nix | 10 ++++++++++ custom/modules/kernel.nix | 12 ++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/custom/modules/default.nix b/custom/modules/default.nix index 5775016..9c06295 100644 --- a/custom/modules/default.nix +++ b/custom/modules/default.nix @@ -85,6 +85,16 @@ in } ); } + { + name = "input"; + structuredExtraConfig = ( + with lib.kernel; + { + MOUSE_APPLETOUCH = no; + INPUT_TOUCHSCREEN = no; + } + ); + } ]; }; } diff --git a/custom/modules/kernel.nix b/custom/modules/kernel.nix index ad63b9a..3542c9f 100644 --- a/custom/modules/kernel.nix +++ b/custom/modules/kernel.nix @@ -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[@]}"