diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-07-03 14:26:41 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-07-06 07:11:26 +0000 |
| commit | 4195ac320b9420cad19c03fa4f70cf3737f1e9ee (patch) | |
| tree | 5c546bb5b85a8888a3336089c6293ab0b30f7d06 | |
| parent | 7c1c19b4dfb1d1601ab958e0dc3666db1c69f26b (diff) | |
libtool,libtool_1_5: don't fix libtool
For the same reason we disable shebang patching in these derivations,
we want to disable the patching of libtool scripts stdenv does.
Otherwise, libtool will install scripts into other packages that are
already "fixed", but for the environment libtool was built in. These
scripts won't be fixed properly by stdenv anymore, because it will
think they were already fixed.
This fixes the build of pkgsStatic.libwebp, which was failing because
its libtool script wasn't being patched properly.
Another problem "fixing" the scripts in the libtool package would
cause is that package tarballs generated on NixOS would contain
libtool scripts that didn't make sense on other distros.
I've tested this change by building pkgsStatic.libwebp, which now
works, as well as by testing the build of the bootstrap files for
mips64el to make sure that didn't regress from 97c43828fb7
("fixLibtool(): patch ./configure, add `file` to common-path.nix").
| -rw-r--r-- | pkgs/development/tools/misc/libtool/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/libtool/libtool2.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 1cd195a3132db..66f673be6370a 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! dontPatchShebangs = true; + dontFixLibtool = true; meta = { description = "Generic library support script"; diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 813cc71938f29..92a230374df65 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! dontPatchShebangs = true; + dontFixLibtool = true; # XXX: The GNU ld wrapper does all sorts of nasty things wrt. RPATH, which # leads to the failure of a number of tests. |