cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #200394 from wegank/neko-aarch64-darwin

Browse source 
Closes https://github.com/NixOS/nixpkgs/issues/159120
This commit is contained in:
Martin Weinelt 2022-11-14 22:58:38 +01:00 committed by GitHub
commit 8872cf637e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/compilers/neko/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, boehmgc, zlib, sqlite, pcre, cmake, pkg-config { lib, stdenv, fetchFromGitHub, fetchpatch, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs , git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
}: }:
@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "19rc59cx7qqhcqlb0znwbnwbg04c1yq6xmvrwm1xi46k3vxa957g"; sha256 = "19rc59cx7qqhcqlb0znwbnwbg04c1yq6xmvrwm1xi46k3vxa957g";
}; };
patches = [
# https://github.com/HaxeFoundation/neko/pull/224
(fetchpatch {
url = "https://github.com/HaxeFoundation/neko/commit/ff5da9b0e96cc0eabc44ad2c10b7a92623ba49ee.patch";
sha256 = "sha256-isM7QGPiyXgT2zpIGd+r12vKg7I1rOWYTTWxuECafro=";
})
];
nativeBuildInputs = [ cmake pkg-config git ]; nativeBuildInputs = [ cmake pkg-config git ];
buildInputs = buildInputs =
[ boehmgc zlib sqlite pcre apacheHttpd apr aprutil [ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
@ -26,7 +34,9 @@ stdenv.mkDerivation rec {
bin/neko bin/test.n bin/neko bin/test.n
''; '';
doInstallCheck = true; # Called from tools/test.neko line 2
# Uncaught exception - Segmentation fault
doInstallCheck = !stdenv.isDarwin;
dontPatchELF = true; dontPatchELF = true;
dontStrip = true; dontStrip = true;