Skip to content

Commit

Permalink
scowl: fix darwin build
Browse files Browse the repository at this point in the history
/cc ZHF #36454

(cherry picked from commit e52250b)
LnL7 committed Mar 25, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 22ad26e commit 642a86b
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions pkgs/data/misc/scowl/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{stdenv, fetchFromGitHub, unzip, zip, perl, aspell, dos2unix, singleWordlist ? null}:
{ stdenv, fetchFromGitHub, unzip, zip, libiconv, perl, aspell, dos2unix
, singleWordlist ? null
}:

stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "scowl";
@@ -11,10 +14,15 @@ stdenv.mkDerivation rec {
sha256 = "16mgk6scbw8i38g63kh60bsnzgzfs8gvvz2n5jh4x5didbwly8nz";
};

buildInputs = [];
nativeBuildInputs = [unzip zip perl aspell dos2unix];
postPatch = ''
substituteInPlace scowl/src/Makefile \
--replace g++ c++
'';

nativeBuildInputs = [ unzip zip perl aspell dos2unix ];
buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;

NIX_CFLAGS_COMPILE = " -Wno-narrowing ";
NIX_CFLAGS_COMPILE = "-Wno-narrowing";

preConfigure = ''
patchShebangs .
@@ -34,8 +42,8 @@ stdenv.mkDerivation rec {
installPhase = if singleWordlist == null then ''
eval "$preInstall"
mkdir -p "$out/share/scowl"
mkdir -p "$out/lib" "$out/share/hunspell" "$out/share/myspell"
mkdir -p "$out/share/scowl"
mkdir -p "$out/lib" "$out/share/hunspell" "$out/share/myspell"
mkdir -p "$out/share/dict"
cp -r scowl/speller/aspell "$out/lib/aspell"

0 comments on commit 642a86b

Please sign in to comment.