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

system.nixpkgs: fix build

Browse Source
This commit is contained in:
陈浩南 2024-06-23 11:47:38 +08:00
parent 4a1f12adbb
commit 47c77e8ce1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/system/nixpkgs.nix
View File

@ -23,7 +23,7 @@ inputs:
nixpkgs =
let
permittedInsecurePackages =
[ "openssl_1_1" "python2" "electron_24" "zotero" "electron_25" "electron_28" ];
[ "openssl_1_1" "python2" "zotero" "electron_28" ];
hostPlatform = if nixpkgs.march != null
then { system = "${nixpkgs.arch}-linux"; gcc = { arch = nixpkgs.march; tune = nixpkgs.march; }; }
else "${nixpkgs.arch}-linux";
@ -40,9 +40,7 @@ inputs:
inherit hostPlatform;
config = cudaConfig //
{
permittedInsecurePackages = map
(package: inputs.pkgs.${package}.name)
(filter (package: inputs.pkgs ? ${package}) permittedInsecurePackages);
permittedInsecurePackages = map (package: inputs.pkgs.${package}.name) permittedInsecurePackages;
allowUnfree = true;
qchem-config = { optArch = nixpkgs.march; useCuda = nixpkgs.cuda.enable; };
}
@ -79,6 +77,7 @@ inputs:
"pkgs-22.11" = "nixpkgs-22.11";
"pkgs-22.05" = "nixpkgs-22.05";
};
permittedInsecurePackages."pkgs-23.11" = [ "electron_19" ];
packages = name: import inputs.topInputs.${source.${name}}
{
localSystem = hostPlatform;
@ -90,7 +89,7 @@ inputs:
let pkgs = inputs.topInputs.${source.${name}}.legacyPackages.${system};
in map
(package: pkgs.${package}.name)
(filter (package: pkgs ? ${package}) permittedInsecurePackages);
permittedInsecurePackages.${name} or [];
};
};
in builtins.listToAttrs (map