chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2024-10-23 10:29:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

do not build with ccache

Browse Source
This commit is contained in:
陈浩南 2023-12-04 11:41:29 +08:00
parent dfad8c1df7
commit f9e35b8837
3 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock
View File

@ -1169,11 +1169,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1701485421, "lastModified": 1701660218,
"narHash": "sha256-JElGXBFzRIigI7BNA4t47iHTkpimQI+s3IbpzpKtrgo=", "narHash": "sha256-hW/PSHXaF8L/06RN6fa/ZNyEjJCy0T2lN91dtBZ/FvE=",
"owner": "CHN-beta", "owner": "CHN-beta",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cc66a68d003925ee63322f7aa5e73a0ff264d18b", "rev": "3acbf3e037d3b8fafaac4a7e60defe9e8f741865",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1185,11 +1185,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1701525262, "lastModified": 1701660161,
"narHash": "sha256-QHa0f+kVImvP7QV1RoqoXFmnwBhlDZdI3lX4kQZjUV8=", "narHash": "sha256-Q6N91xL87pMyKcV983ffJsjq13TItxdMNqMSPiBnUXY=",
"owner": "CHN-beta", "owner": "CHN-beta",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2357a8cea1218117754ad6d147ceb5890c651350", "rev": "f90d85fe584c552c76252ccfa534ac30f2a6b4c6",
"type": "github" "type": "github"
}, },
"original": { "original": {

17
modules/packages/default.nix
View File

@ -323,20 +323,9 @@ inputs:
)) ))
(attrsToList servers))); (attrsToList servers)));
}; };
nixpkgs.config = nixpkgs.config.permittedInsecurePackages = map (p: p.name)
{ (with inputs.pkgs; [ openssl_1_1 electron_19 python2 electron_12 electron_24 zotero ]);
permittedInsecurePackages = with inputs.pkgs; home-manager = { useGlobalPkgs = true; useUserPackages = true; };
[
openssl_1_1.name electron_19.name python2.name electron_12.name electron_24.name
zotero.name
];
allowUnfree = true;
};
home-manager =
{
useGlobalPkgs = true;
useUserPackages = true;
};
} }
# >= desktop # >= desktop
( (

15
modules/system/nixpkgs.nix
View File

@ -20,20 +20,19 @@ inputs:
{ {
nixpkgs = nixpkgs =
{ {
config.allowUnfree = true; config = { allowUnfree = true; cudaSupport = nixpkgs.cudaSupport; };
config.cudaSupport = nixpkgs.cudaSupport; overlays = [(final: prev: { genericPackages = import inputs.topInputs.nixpkgs
overlays = [(final: prev:
{ {
genericPackages = system = "x86_64-linux";
import inputs.topInputs.nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; }; config = { allowUnfree = true; inherit (inputs.config.nixpkgs.config) permittedInsecurePackages; };
})]; };})];
}; };
programs.ccache = { enable = true; cacheDir = "/var/lib/ccache"; };
nix.settings.extra-sandbox-paths = [ inputs.config.programs.ccache.cacheDir ];
} }
( (
mkConditional (nixpkgs.march != null) mkConditional (nixpkgs.march != null)
{ {
programs.ccache = { enable = true; cacheDir = "/var/lib/ccache"; };
nix.settings.extra-sandbox-paths = [ inputs.config.programs.ccache.cacheDir ];
nixpkgs = nixpkgs =
{ {
hostPlatform = { system = "x86_64-linux"; gcc = { arch = nixpkgs.march; tune = nixpkgs.march; }; }; hostPlatform = { system = "x86_64-linux"; gcc = { arch = nixpkgs.march; tune = nixpkgs.march; }; };