tjh.dev
texinfo: fix cross
+8
-1
pkgs/development/tools/misc/texinfo/5.2.nix
+8
-1
pkgs/development/tools/misc/texinfo/5.2.nix
···
1
-
{ stdenv, fetchurl, ncurses, perl, xz, procps, interactive ? false }:
1
+
{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, procps, interactive ? false }:
2
2
3
3
with stdenv.lib;
4
4
···
10
10
sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
11
11
};
12
12
13
+
# We need a native compiler to build perl XS extensions
14
+
# when cross-compiling.
15
+
depsBuildBuild = [ buildPackages.stdenv.cc perl ];
16
+
13
17
buildInputs = [ perl xz.bin ]
14
18
++ optional interactive ncurses
15
19
++ optional doCheck procps; # for tests
20
+
21
+
configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
22
+
++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
16
23
17
24
preInstall = ''
18
25
installFlags="TEXMF=$out/texmf-dist";
+8
-3
pkgs/development/tools/misc/texinfo/6.5.nix
+8
-3
pkgs/development/tools/misc/texinfo/6.5.nix
···
1
-
{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }:
1
+
{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }:
2
2
3
3
with stdenv.lib;
4
4
···
10
10
sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
11
11
};
12
12
13
-
buildInputs = [ perl xz ]
13
+
# We need a native compiler to build perl XS extensions
14
+
# when cross-compiling.
15
+
depsBuildBuild = [ buildPackages.stdenv.cc perl ];
16
+
17
+
buildInputs = [ xz ]
14
18
++ optionals stdenv.isSunOS [ libiconv gawk ]
15
19
++ optional interactive ncurses
16
20
++ optional doCheck procps; # for tests
17
21
18
-
configureFlags = stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
22
+
configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
23
+
++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
19
24
20
25
preInstall = ''
21
26
installFlags="TEXMF=$out/texmf-dist";