pyrox.dev
lol
expect: fix cross compile
authored by
Sandro Jäckel
and committed by
Rick van Schijndel
73f3eedb
cedd23b2
+16
-1
+5
-1
pkgs/tools/misc/expect/default.nix
+5
-1
pkgs/tools/misc/expect/default.nix
···
1
-
{ lib, stdenv, buildPackages, fetchurl, tcl, makeWrapper, autoreconfHook, fetchpatch }:
1
+
{ lib, stdenv, buildPackages, fetchurl, tcl, makeWrapper, autoreconfHook, fetchpatch, substituteAll }:
2
2
3
3
tcl.mkTclDerivation rec {
4
4
pname = "expect";
···
13
13
(fetchpatch {
14
14
url = "https://raw.githubusercontent.com/buildroot/buildroot/c05e6aa361a4049eabd8b21eb64a34899ef83fc7/package/expect/0001-enable-cross-compilation.patch";
15
15
sha256 = "1jwx2l1slidvcpahxbyqs942l81jd62rzbxliyd9lwysk38c8b6b";
16
+
})
17
+
(substituteAll {
18
+
src = ./fix-cross-compilation.patch;
19
+
tcl = "${buildPackages.tcl}/bin/tclsh";
16
20
})
17
21
];
18
22
+11
pkgs/tools/misc/expect/fix-cross-compilation.patch
+11
pkgs/tools/misc/expect/fix-cross-compilation.patch
···
1
+
--- a/Makefile.in 2022-09-07 21:46:37.090519258 +0200
2
+
+++ b/Makefile.in 2022-09-07 21:46:21.462592279 +0200
3
+
@@ -380,7 +380,7 @@
4
+
cp $(DIST_ROOT)/$(PKG_DIR).tar.gz $(top_builddir)
5
+
6
+
$(SCRIPTS):
7
+
- $(TCLSH) $(srcdir)/fixline1 $(SHORT_BINDIR) < $(srcdir)/example/$@ > $@
8
+
+ @tcl@ $(srcdir)/fixline1 $(SHORT_BINDIR) < $(srcdir)/example/$@ > $@
9
+
10
+
## We cannot use TCL_LIBS below (after TCL_LIB_SPEC) because its
11
+
## expansion references the contents of LIBS, which contains linker