tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
0
fork
atom
overview
issues
pulls
pipelines
lensfun: fix build by using older make
Vladimír Čunát
11 years ago
9a75c1d7
2b8328a1
+6
-3
2 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
lensfun
default.nix
top-level
all-packages.nix
+2
-2
pkgs/development/libraries/lensfun/default.nix
···
1
1
-
{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng }:
1
1
+
{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3 }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "lensfun-0.2.8";
···
10
10
11
11
patchPhase = "sed -e 's@/usr/bin/python@${python}/bin/python@' -i configure";
12
12
13
13
-
buildInputs = [ pkgconfig glib zlib libpng ];
13
13
+
buildInputs = [ pkgconfig glib zlib libpng gnumake3 ];
14
14
15
15
configureFlags = "-v";
16
16
+4
-1
pkgs/top-level/all-packages.nix
···
5037
5037
gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { };
5038
5038
gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { };
5039
5039
gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
5040
5040
+
gnumake3 = gnumake382;
5040
5041
gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { };
5041
5042
gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { };
5042
5043
gnumake = gnumake41;
···
6116
6117
python = python2;
6117
6118
};
6118
6119
6119
6119
-
lensfun = callPackage ../development/libraries/lensfun { };
6120
6120
+
lensfun = callPackage ../development/libraries/lensfun {
6121
6121
+
inherit gnumake3;
6122
6122
+
};
6120
6123
6121
6124
lesstif = callPackage ../development/libraries/lesstif { };
6122
6125