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

use upstream nixpkgs temperaly

Browse Source
This commit is contained in:
陈浩南 2023-06-15 10:58:29 +08:00
parent 680f462a7f
commit e14f57bf54
2 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flake.lock
View File

@ -229,15 +229,15 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1686794864,
"narHash": "sha256-OakDEYer26X76ViIXMvJgOw4w2qRDvzpfxATvCaoGE4=",
"owner": "CHN-beta",
"lastModified": 1686592866,
"narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "57902dfe3d1ba3264ff1353131063105040c34e5",
"rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05",
"type": "github"
},
"original": {
"owner": "CHN-beta",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"

28
flake.nix
View File

@ -3,7 +3,7 @@
inputs =
{
nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05";
flake-utils.url = "github:numtide/flake-utils";
flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
@ -120,32 +120,6 @@
./modules/virtualisation/waydroid.nix
./modules/home/root.nix
./modules/home/chn.nix
({ pkgs, ...}@inputs:
{
config.environment.systemPackages =
[
( inputs.inputs.nixpkgs.lib.nixosSystem
{
system = "x86_64-linux";
modules = [({ pkgs, ... }@inputs:
{
config.nixpkgs =
{
hostPlatform =
{ system = "x86_64-linux"; gcc = { arch = "alderlake"; tune = "alderlake"; }; };
config.allowUnfree = true;
};
config.nixpkgs.overlays = [( final: prev: rec
{
optimizeWithFlags = pkg: flags: pkg.overrideAttrs (old:
{ NIX_CFLAGS_COMPILE = [ (old.NIX_CFLAGS_COMPILE or "") ] ++ flags; });
hello = optimizeWithFlags prev.hello [ "-frecord-gcc-switches" ];
} )];
})];
} ).pkgs.hello
];
})
];
};