diff options
| author | Adam Joseph <adam@westernsemico.com> | 2022-08-20 19:56:11 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2022-08-20 20:16:12 -0700 |
| commit | b5aad8addf1d4a84dbf7545965584bd19fb7e42e (patch) | |
| tree | 9283756aa08f76ae3ec3f0e8f1f230344d5744cc /pkgs/development/tools/misc/libtool | |
| parent | 77394c111ba7ac7ad2ca48d8451e0fb58f801951 (diff) | |
libtool: fix shebang-fixing from 2.4.7 version bump
Libtool 2.4.7 changed the shebangs in `libtoolize.in` and `ltmain.sh` from `/bin/sh` (which is a special sandbox exception) to `/usr/bin/env sh` (which is not). My PR (#167071) to bump the libtool version adjusted both of these shebangs, when it should only have adjusted the one in `libtoolize.in`. `ltmain.sh` is not a script to be *executed* at `libtool`-invocation-time. It is a script which is *vendored into a release* at `libtoolize`-invocation-time. Thanks to @trofi for reporting this https://github.com/NixOS/nixpkgs/pull/167071#pullrequestreview-1079484605
Diffstat (limited to 'pkgs/development/tools/misc/libtool')
| -rw-r--r-- | pkgs/development/tools/misc/libtool/libtool2.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 92a230374df65..8625a421af64f 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -38,10 +38,9 @@ stdenv.mkDerivation rec { # libtool commit da2e352735722917bf0786284411262195a6a3f6 changed # the shebang from `/bin/sh` (which is a special sandbox exception) # to `/usr/bin/env sh`, meaning that we now need to patch shebangs - # in libtoolize and ltmain.sh since `dontPatchShebangs` is set: + # in libtoolize.in: '' substituteInPlace libtoolize.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}' - substituteInPlace build-aux/ltmain.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}' ''; strictDeps = true; |