AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix recompile

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-08-05 07:42:39 +03:00
parent 5eea03e555
commit eb5c560893
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
profiles/hardened.nix
View File

@ -88,4 +88,9 @@
# scudo memalloc is unstable # scudo memalloc is unstable
environment.memoryAllocator.provider = lib.mkDefault "scudo"; environment.memoryAllocator.provider = lib.mkDefault "scudo";
# environment.memoryAllocator.provider = lib.mkDefault "graphene-hardened"; # environment.memoryAllocator.provider = lib.mkDefault "graphene-hardened";
# dhcpcd broken with scudo or graphene malloc
nixpkgs.overlays = [(final: prev: {
dhcpcd = prev.dhcpcd.override { enablePrivSep = false; };
})];
} }

11
profiles/overlay.nix
View File

@ -38,13 +38,6 @@ with lib; {
extraPkgs = pkgs: with pkgs; [ mono libkrb5 keyutils ]; extraPkgs = pkgs: with pkgs; [ mono libkrb5 keyutils ];
}; };
# I don't want to compile all of this
webkitgtk = stable.webkitgtk;
webkitgtk_6_0 = stable.webkitgtk_6_0;
webkitgtk_4_1 = stable.webkitgtk_4_1;
nixos-option = stable.nixos-option;
nil = stable.nil;
nix = inputs.nix.packages.${system}.default.overrideAttrs (oa: { nix = inputs.nix.packages.${system}.default.overrideAttrs (oa: {
doInstallCheck = false; doInstallCheck = false;
patches = [ ./nix/doas.patch ] ++ oa.patches or [ ]; patches = [ ./nix/doas.patch ] ++ oa.patches or [ ];
@ -77,6 +70,10 @@ with lib; {
yandex-taxi-py = prev.writers.writePython3 "yandex-taxi.py" { yandex-taxi-py = prev.writers.writePython3 "yandex-taxi.py" {
libraries = with prev.python3Packages; [ requests ]; libraries = with prev.python3Packages; [ requests ];
} ./packages/yandex-taxi-py.nix; } ./packages/yandex-taxi-py.nix;
# can't build with nix 2.17
nixos-option = stable.nixos-option;
nil = stable.nil;
} }
) )
]; ];