diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-20 20:31:39 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-20 20:31:39 +0100 |
commit | 43a88e3d8a68a008abea0bca0b17805aa4910764 (patch) | |
tree | dfedec7c941b61fdd748bdf9806344d24c5f29f2 /pkgs/development/libraries/aspell | |
parent | a34b0274ef111f02299c7b3435b4502eeb4deb3e (diff) | |
parent | fbe38c7c442e21b9eaa9a145c0e2bfe134f7f367 (diff) | |
download | nixpkgs-43a88e3d8a68a008abea0bca0b17805aa4910764.tar nixpkgs-43a88e3d8a68a008abea0bca0b17805aa4910764.tar.gz nixpkgs-43a88e3d8a68a008abea0bca0b17805aa4910764.tar.bz2 nixpkgs-43a88e3d8a68a008abea0bca0b17805aa4910764.tar.lz nixpkgs-43a88e3d8a68a008abea0bca0b17805aa4910764.tar.xz nixpkgs-43a88e3d8a68a008abea0bca0b17805aa4910764.tar.zst nixpkgs-43a88e3d8a68a008abea0bca0b17805aa4910764.zip |
Merge branch 'gcc-7' into staging
Close #27794.
Diffstat (limited to 'pkgs/development/libraries/aspell')
-rw-r--r-- | pkgs/development/libraries/aspell/default.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index cccd93e5d4d..d0e93337a39 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, perl -, searchNixProfiles ? true}: +{ stdenv, fetchurl, fetchpatch, perl +, searchNixProfiles ? true +}: stdenv.mkDerivation rec { name = "aspell-0.60.6.1"; @@ -9,10 +10,16 @@ stdenv.mkDerivation rec { sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm"; }; - patchPhase = '' + patches = [ + (fetchpatch { # remove in >= 0.60.7 + name = "gcc-7.patch"; + url = "https://github.com/GNUAspell/aspell/commit/8089fa02122fed0a.diff"; + sha256 = "1b3p1zy2lqr2fknddckm58hyk95hw4scf6hzjny1v9iaic2p37ix"; + }) + ] ++ stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; + + postPatch = '' patch interfaces/cc/aspell.h < ${./clang.patch} - '' + stdenv.lib.optionalString searchNixProfiles '' - patch -p1 < ${./data-dirs-from-nix-profiles.patch} ''; nativeBuildInputs = [ perl ]; |