nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "native opts go nyoom" 

This reverts commit e5d187e4c5.
This commit is contained in:
Nathan McCarty 2023-01-13 17:11:08 -05:00
parent e5d187e4c5
commit 5a35af54db
Signed by: thatonelutenist
GPG Key ID: D70DA3DD4D1E9F96
1 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
machines/levitation/configuration.nix
View File

@ -74,8 +74,7 @@
# Configure nix build
nix.settings = {
cores = 8;
max-jobs = 6;
system-features = [ "gccarch-znver3" ];
max-jobs = 8;
};
# Calibre
@ -91,37 +90,4 @@
enableBookUploading = true;
};
};
nixpkgs = {
# Native opts go nyoom
localSystem = {
gcc = {
arch = "znver3";
tune = "znver3";
};
system = "x86_64-linux";
};
# Fix some packages that are broken on nixos-21.11 with march=znver3
# We'll substitute these with the version from a second import of nixpkgs without the gcc
# configuration.
overlays = [
(self: super:
let
vanilla-pkgs = import inputs.nixpkgs-unstable {
system = "x86_64-linux";
config = {
localSystem = {
gcc = {
arch = null;
tune = null;
};
};
};
};
in {
libxcrypt = vanilla-pkgs.libxcrypt;
perl = vanilla-pkgs.perl;
})
];
};
}