flake: nixpkgs port patches

This commit is contained in:
2025-05-11 09:21:50 +08:00
parent 46440b22f8
commit 0317518f64
3 changed files with 3 additions and 6 deletions

6
flake.lock generated
View File

@@ -1000,11 +1000,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1746663147,
"narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=",
"lastModified": 1746926443,
"narHash": "sha256-82Iu+T9xlnbsVcKbu17rVazetM6JzYTaVg/JYuPPpo0=",
"owner": "CHN-beta",
"repo": "nixpkgs",
"rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54",
"rev": "fa20c1d562a01a115ebc06b95405bea1d7291ef9",
"type": "github"
},
"original": {

View File

@@ -29,7 +29,6 @@ in platformConfig //
oneapiArch = let match = {}; in match.${nixpkgs.march} or nixpkgs.march;
nvhpcArch = nixpkgs.march;
# contentAddressedByDefault = true;
enableCcache = true;
})
// (inputs.lib.optionalAttrs (nixpkgs.nixRoot != null)
{ nix = { storeDir = "${nixpkgs.nixRoot}/store"; stateDir = "${nixpkgs.nixRoot}/var"; }; });

View File

@@ -16,8 +16,6 @@ inputs:
config = let inherit (inputs.config.nixos.system) nixpkgs; in
{
nixpkgs = import ./buildNixpkgsConfig.nix { inherit inputs; nixpkgs = nixpkgs // { nixRoot = null; }; };
programs.ccache = { enable = true; cacheDir = "/var/lib/ccache"; };
nix.settings.extra-sandbox-paths = [ inputs.config.programs.ccache.cacheDir ];
boot.kernelPatches = inputs.lib.mkIf (nixpkgs.march != null)
[{
name = "native kernel";