diff --git a/nixos/nixified.ai.nix b/nixos/nixified.ai.nix index 85aa1923..079ee22d 100644 --- a/nixos/nixified.ai.nix +++ b/nixos/nixified.ai.nix @@ -30,8 +30,22 @@ }; packagesAlreadyInPrev = builtins.filter (name: python-prev ? ${name}) (builtins.attrNames extraPackages); + nixifiedExtraPackages = builtins.removeAttrs extraPackages packagesAlreadyInPrev; in - builtins.removeAttrs extraPackages packagesAlreadyInPrev + nixifiedExtraPackages + // { + tokenizers = python-prev.tokenizers.overrideAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [final.clang]; + env = + (old.env or {}) + // { + CC = "${final.clang}/bin/clang"; + HOST_CC = "${final.clang}/bin/clang"; + CC_x86_64_unknown_linux_gnu = "${final.clang}/bin/clang"; + CFLAGS = "-O2"; + }; + }); + } ); }; diff --git a/nixos/xmonad.nix b/nixos/xmonad.nix index 406993d6..c3f9b19b 100644 --- a/nixos/xmonad.nix +++ b/nixos/xmonad.nix @@ -14,6 +14,21 @@ in nixpkgs.overlays = with inputs; [ xmonad.overlay xmonad-contrib.overlay + (final: prev: { + haskellPackages = prev.haskellPackages.override (old: { + overrides = + final.lib.composeExtensions (old.overrides or (_: _: {})) + (_hself: hsuper: { + ghc-exactprint = final.haskell.lib.disableOptimization hsuper.ghc-exactprint; + language-c = final.haskell.lib.disableOptimization hsuper.language-c; + optics-core = final.haskell.lib.disableOptimization hsuper.optics-core; + X11 = final.haskell.lib.disableOptimization hsuper.X11; + X11-xft = + final.haskell.lib.dontHaddock + (final.haskell.lib.disableOptimization hsuper.X11-xft); + }); + }); + }) (import ../dotfiles/config/xmonad/overlay.nix) ];