chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 01:09:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

system.nix: keepOutputs -> includeBuildDependencies

Browse Source
This commit is contained in:
陈浩南
2024-02-01 10:43:54 +08:00
parent a577616756
commit c08fd457cb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
devices/pc/default.nix
View File

@@ -50,7 +50,6 @@ inputs:
# SERIALIZE SGX WAITPKG WIDEKL XSAVE XSAVEOPT
"alderlake"
];
keepOutputs = true;
};
nixpkgs =
{ march = "znver4"; cuda = { enable = true; capabilities = [ "8.9" ]; forwardCompat = false; }; };

1
flake.nix
View File

@@ -144,5 +144,6 @@
checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib;
overlays.default = final: prev:
{ localPackages = (import ./local/pkgs { inherit (inputs) lib; pkgs = final; }); };
config.production = false;
};
}

5
modules/system/nix.nix
View File

@@ -4,7 +4,7 @@ inputs:
{
# marches allowed to be compiled on this machine
marches = mkOption { type = types.nullOr (types.listOf types.nonEmptyStr); default = null; };
keepOutputs = mkOption { type = types.bool; default = false; };
includeBuildDependencies = mkOption { type = types.bool; default = inputs.topInputs.self.config.production; };
substituters = mkOption { type = types.nullOr (types.listOf types.nonEmptyStr); default = null; };
autoOptimiseStore = mkOption { type = types.bool; default = false; };
};
@@ -25,7 +25,7 @@ inputs:
else nix.marches
));
experimental-features = [ "nix-command" "flakes" ];
keep-outputs = nix.keepOutputs;
keep-outputs = nix.includeBuildDependencies;
keep-failed = true;
auto-optimise-store = nix.autoOptimiseStore;
substituters = if nix.substituters == null then [ "https://cache.nixos.org/" ] else nix.substituters;
@@ -61,6 +61,7 @@ inputs:
};
variables.COMMA_NIXPKGS_FLAKE = "nixpkgs-unstable";
};
system.includeBuildDependencies = nix.includeBuildDependencies;
# environment.pathsToLink = [ "/include" ];
# environment.variables.CPATH = "/run/current-system/sw/include";
# environment.variables.LIBRARY_PATH = "/run/current-system/sw/lib";