From f0077dc7dad7bec5f2823834a6337cb5db1a2299 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 27 Nov 2018 21:40:57 -0600 Subject: transfig: use imake setup hook --- pkgs/tools/graphics/transfig/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'pkgs/tools/graphics/transfig') diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index cb3f0edff0f..ceee3b7674d 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, libjpeg, libpng, imake}: +{ stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }: stdenv.mkDerivation rec { name = "transfig-3.2.4"; @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4"; }; - buildInputs = [zlib libjpeg libpng imake]; + nativeBuildInputs = [ imake gccmakedep ]; + buildInputs = [ zlib libjpeg libpng ]; patches = [ ./patch-fig2dev-dev-Imakefile @@ -45,12 +46,7 @@ stdenv.mkDerivation rec { runHook postPatch ''; - preBuild = '' - xmkmf - make Makefiles - ''; - - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; preInstall = '' mkdir -p $out -- cgit 1.4.1