From 031af8f0cf9687838960cd9d11073766fe9366a0 Mon Sep 17 00:00:00 2001 From: LluĂ­s Batlle i Rossell Date: Fri, 23 Jan 2015 16:08:05 +0100 Subject: Making freeimage build and install freeimageplus too. I need it for the pgf command line tool (next commit) (cherry picked from commit f6856be9eefc5785b7c38e7398106d9a220f2a37) --- pkgs/development/libraries/freeimage/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/freeimage') diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index c3cfa6e8c87b..2cfb5d3522f9 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -10,9 +10,12 @@ stdenv.mkDerivation { sed -e s@/usr/@$out/@ \ -e 's@-o root -g root@@' \ -e 's@ldconfig@echo not running ldconfig@' \ - -i Makefile.gnu + -i Makefile.gnu Makefile.fip ''; + + postBuild = "make -f Makefile.fip"; preInstall = "mkdir -p $out/include $out/lib"; + postInstall = "make -f Makefile.fip install"; meta = { description = "Open Source library for accessing popular graphics image file formats"; -- cgit 1.4.1