From 2cc8680b88f1198fd4ea471572d450d2f2e377fb Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 10 Sep 2015 18:30:33 +0200 Subject: [PATCH] neko: Add patch fixing arg handling on 32bit. The error was reported at HaxeFoundation/haxelib#152 and was fixed by HaxeFoundation/neko#41 in HaxeFoundation/neko@ccc78c2, the latter being fetchpatch'ed by us now. This has caused the hxcpp build to fail on i686-linux with an "Invalid array access" error. Signed-off-by: aszlig --- pkgs/development/compilers/neko/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 0321ae1f60ab..32c1bbbe9414 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre }: +{ stdenv, fetchurl, fetchpatch, boehmgc, zlib, sqlite, pcre }: stdenv.mkDerivation rec { name = "neko-${version}"; @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1lcm1ahbklfpd5lnqjwmvyj2vr85jbq57hszk5jgq0x6yx6p3927"; }; + patches = stdenv.lib.singleton (fetchpatch { + url = "https://github.com/HaxeFoundation/neko/commit/" + + "ccc78c29deab7971e1369f4fe3dedd14cf9f3128.patch"; + sha256 = "1nya50rzai15hmpq2azganjxzgrfydf30glfwirgw6q8z7z3wpkq"; + }); + prePatch = with stdenv.lib; let libs = concatStringsSep "," (map (lib: "\"${lib}/include\"") buildInputs); in ''