From b13df4545ca3b123db9f860c0f3fe4aed88b65ad Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 28 May 2019 20:39:26 +0200 Subject: trinity: small clean up --- pkgs/os-specific/linux/trinity/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index cc85740afdd..b855f0547ba 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "trinity-${version}"; + pname = "trinity"; version = "1.9"; src = fetchFromGitHub { @@ -11,16 +11,9 @@ stdenv.mkDerivation rec { 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 = '' - patchShebangs ./configure - patchShebangs ./scripts/ + patchShebangs configure + patchShebangs scripts ''; enableParallelBuilding = true; -- cgit 1.4.1