public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lensfun: fix build by using older make

Browse Source
This commit is contained in:
Vladimír Čunát 2015-03-24 21:06:19 +01:00
parent 2b8328a111
commit 9a75c1d7c8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/lensfun/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng }: { stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lensfun-0.2.8"; name = "lensfun-0.2.8";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
patchPhase = "sed -e 's@/usr/bin/python@${python}/bin/python@' -i configure"; 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"; configureFlags = "-v";

5
pkgs/top-level/all-packages.nix
View File

@ -5037,6 +5037,7 @@ let
gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { }; gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { };
gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { }; gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { };
gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
gnumake3 = gnumake382;
gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { };
gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { }; gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { };
gnumake = gnumake41; gnumake = gnumake41;
@ -6116,7 +6117,9 @@ let
python = python2; python = python2;
}; };
lensfun = callPackage ../development/libraries/lensfun { }; lensfun = callPackage ../development/libraries/lensfun {
inherit gnumake3;
};
lesstif = callPackage ../development/libraries/lesstif { }; lesstif = callPackage ../development/libraries/lesstif { };