diff options
| author | Michael Stone <m@mstone.info> | 2021-09-23 11:14:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 17:14:07 +0200 |
| commit | 470466fdbd5991c0f7d81fa657e45458730ff7c8 (patch) | |
| tree | 04d6701f737642e37754dfa97f1ae847aad46417 /pkgs/stdenv | |
| parent | 714fdd6f3811e760871b387498b48c8c16c47085 (diff) | |
| download | nixlib-470466fdbd5991c0f7d81fa657e45458730ff7c8.tar nixlib-470466fdbd5991c0f7d81fa657e45458730ff7c8.tar.gz nixlib-470466fdbd5991c0f7d81fa657e45458730ff7c8.tar.bz2 nixlib-470466fdbd5991c0f7d81fa657e45458730ff7c8.tar.lz nixlib-470466fdbd5991c0f7d81fa657e45458730ff7c8.tar.xz nixlib-470466fdbd5991c0f7d81fa657e45458730ff7c8.tar.zst nixlib-470466fdbd5991c0f7d81fa657e45458730ff7c8.zip | |
sigtool: 4a3719b4 -> 2a13539d (#138453)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b5a9f0cc5cb9..81313fb390ec 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -268,6 +268,12 @@ rec { ${bootstrapTools}/bin/codesign > $out/bin/codesign chmod a+x $out/bin/codesign ''; + # on next bootstrap tools update, use the following: + # installPhase = '' + # mkdir -p $out/bin + # ln -s ${bootstrapTools}/bin/sigtool $out/bin + # ln -s ${bootstrapTools}/bin/codesign $out/bin + # ''; }; print-reexports = stdenv.mkDerivation { diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index c62e72f6047c..434eadb38bf0 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -206,7 +206,7 @@ in rec { done for i in $out/bin/*; do - if test -x "$i" -a ! -L "$i" -a "$(basename $i)" != codesign; then + if test -x "$i" -a ! -L "$i"; then echo "Adding @executable_path to rpath in $i" ${stdenv.cc.targetPrefix}install_name_tool -add_rpath '@executable_path/../lib' $i fi |