From 9a75c1d7c8ee19046ce67f2dc725821d2d5452fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 24 Mar 2015 21:06:19 +0100 Subject: [PATCH] lensfun: fix build by using older make --- pkgs/development/libraries/lensfun/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 94dfe871240..ebb90f79663 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng }: +{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3 }: stdenv.mkDerivation rec { name = "lensfun-0.2.8"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patchPhase = "sed -e 's@/usr/bin/python@${python}/bin/python@' -i configure"; - buildInputs = [ pkgconfig glib zlib libpng ]; + buildInputs = [ pkgconfig glib zlib libpng gnumake3 ]; configureFlags = "-v"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e22a53d8e29..eb83bcc8996 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5037,6 +5037,7 @@ let gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { }; gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { }; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; + gnumake3 = gnumake382; gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { }; gnumake = gnumake41; @@ -6116,7 +6117,9 @@ let python = python2; }; - lensfun = callPackage ../development/libraries/lensfun { }; + lensfun = callPackage ../development/libraries/lensfun { + inherit gnumake3; + }; lesstif = callPackage ../development/libraries/lesstif { };