Merge pull request #62165 from Infinisil/fix/trinity

trinity: small clean up
This commit is contained in:
Maximilian Bosch 2019-06-04 19:56:32 +02:00 committed by GitHub
commit 5940f6b3f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }: { stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "trinity-${version}"; pname = "trinity";
version = "1.9"; version = "1.9";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -11,16 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "0z1a7x727xacam74jccd223k303sllgwpq30lnq9b6xxy8b659bv"; sha256 = "0z1a7x727xacam74jccd223k303sllgwpq30lnq9b6xxy8b659bv";
}; };
# Fails on 32-bit otherwise
NIX_CFLAGS_COMPILE = [
"-Wno-error=int-to-pointer-cast"
"-Wno-error=pointer-to-int-cast"
"-Wno-error=incompatible-pointer-types"
];
postPatch = '' postPatch = ''
patchShebangs ./configure patchShebangs configure
patchShebangs ./scripts/ patchShebangs scripts
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;