From eb5c560893bdcab5c0c39edee9740ac5857348cc Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Sat, 5 Aug 2023 07:42:39 +0300 Subject: [PATCH] fix recompile --- profiles/hardened.nix | 5 +++++ profiles/overlay.nix | 11 ++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/profiles/hardened.nix b/profiles/hardened.nix index 0342cc8..ae57c24 100644 --- a/profiles/hardened.nix +++ b/profiles/hardened.nix @@ -88,4 +88,9 @@ # scudo memalloc is unstable environment.memoryAllocator.provider = lib.mkDefault "scudo"; # environment.memoryAllocator.provider = lib.mkDefault "graphene-hardened"; + + # dhcpcd broken with scudo or graphene malloc + nixpkgs.overlays = [(final: prev: { + dhcpcd = prev.dhcpcd.override { enablePrivSep = false; }; + })]; } \ No newline at end of file diff --git a/profiles/overlay.nix b/profiles/overlay.nix index 8c0670e..1e7dc49 100644 --- a/profiles/overlay.nix +++ b/profiles/overlay.nix @@ -38,13 +38,6 @@ with lib; { 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: { doInstallCheck = false; patches = [ ./nix/doas.patch ] ++ oa.patches or [ ]; @@ -77,6 +70,10 @@ with lib; { yandex-taxi-py = prev.writers.writePython3 "yandex-taxi.py" { libraries = with prev.python3Packages; [ requests ]; } ./packages/yandex-taxi-py.nix; + + # can't build with nix 2.17 + nixos-option = stable.nixos-option; + nil = stable.nil; } ) ];