From b2ad0c7cb46cc809614ecaa45b1413f225309e54 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sat, 18 May 2024 14:58:50 +0200 Subject: user: fix jinx-mode missing dictionaries when launched from DE remove aspell, use nuspell/hunspell instead. They already know where to look for dictionaries. --- overlays/extra-packages.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'overlays') diff --git a/overlays/extra-packages.nix b/overlays/extra-packages.nix index 0e0451d0..0bc408bf 100644 --- a/overlays/extra-packages.nix +++ b/overlays/extra-packages.nix @@ -13,14 +13,17 @@ self: super: { ''; }; }); - enchant = super.enchant.overrideAttrs (old: { - configureFlags = old.configureFlags ++ [ "--without-hspell" ] - # builtins.filter (c: c != "--with-hspell") old.configureFlags - ++ self.lib.optional super.stdenv.isDarwin "--with-applespell" - ; - buildInputs = - builtins.filter (c: c.name != "hspell") old.buildInputs - ++ self.lib.optionals super.stdenv.isDarwin (with super.darwin.apple_sdk.frameworks; [ Cocoa ]); - propagatedBuildInputs = builtins.filter (c: c.name != "hspell") old.propagatedBuildInputs; - }); + enchant = + let + file = builtins.fetchurl { + url = "https://raw.githubusercontent.com/alanpearce/nixpkgs/7ee75d6aa9b088922b47b69c1912b2afe000ae52/pkgs/development/libraries/enchant/2.x.nix"; + sha256 = "1y7h3fvp7ghcfb5v3h6riiv7z2bzgnxm0p696bbhfb0gwwv9q8aw"; + }; + in + super.callPackage file { + withHspell = false; + withAspell = false; + + inherit (super.darwin.apple_sdk.frameworks) Cocoa; + }; } -- cgit 1.4.1