diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-27 12:01:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-27 12:01:56 +0000 |
| commit | e11b11e7383dc9e79174c572b949a1a5884d124d (patch) | |
| tree | 784140f4cf5095ede60e81d23188f3a6875f6aca /pkgs/development/libraries/aspell/dictionaries.nix | |
| parent | dcb1b49be6864d21da07ad41559d3b08967e2232 (diff) | |
| parent | 92b7725154fcb01cc3b5804025e89d6a2941cc77 (diff) | |
| download | nixpkgs-e11b11e7383dc9e79174c572b949a1a5884d124d.tar nixpkgs-e11b11e7383dc9e79174c572b949a1a5884d124d.tar.gz nixpkgs-e11b11e7383dc9e79174c572b949a1a5884d124d.tar.bz2 nixpkgs-e11b11e7383dc9e79174c572b949a1a5884d124d.tar.lz nixpkgs-e11b11e7383dc9e79174c572b949a1a5884d124d.tar.xz nixpkgs-e11b11e7383dc9e79174c572b949a1a5884d124d.tar.zst nixpkgs-e11b11e7383dc9e79174c572b949a1a5884d124d.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/aspell/dictionaries.nix')
| -rw-r--r-- | pkgs/development/libraries/aspell/dictionaries.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 74caec57c2d..ea8a2133c82 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -1,7 +1,5 @@ {lib, stdenv, fetchurl, aspell, which, writeScript}: -with lib; - /* HOWTO: * Add some of these to your profile or systemPackages. @@ -105,7 +103,7 @@ let homepage = "http://ftp.gnu.org/gnu/aspell/dict/0index.html"; } // (args.meta or {}); - } // lib.optionalAttrs (stdenv.isDarwin && elem language [ "is" "nb" ]) { + } // lib.optionalAttrs (stdenv.isDarwin && lib.elem language [ "is" "nb" ]) { # tar: Cannot open: Illegal byte sequence unpackPhase = '' runHook preUnpack @@ -115,7 +113,7 @@ let runHook postUnpack ''; - postPatch = getAttr language { + postPatch = lib.getAttr language { is = '' cp icelandic.alias íslenska.alias sed -i 's/ .slenska\.alias/ íslenska.alias/g' Makefile.pre @@ -137,7 +135,7 @@ let preBuild = '' # Aspell can't handle multiple data-dirs # Copy everything we might possibly need - ${concatMapStringsSep "\n" (p: '' + ${lib.concatMapStringsSep "\n" (p: '' cp -a ${p}/lib/aspell/* . '') ([ aspell ] ++ langInputs)} export ASPELL_CONF="data-dir $(pwd)" |