diff options
| author | Ryan Burns <rtburns@protonmail.com> | 2021-09-23 18:43:00 -0700 |
|---|---|---|
| committer | Ryan Burns <rtburns@protonmail.com> | 2021-09-23 18:43:00 -0700 |
| commit | 40299257cca9008c8f676f92b948cd53e02de90a (patch) | |
| tree | f76fcd94132cffdc543de4a6eb832a29076db522 /pkgs/stdenv | |
| parent | 2a102ddcd7f53364d09d2fb5d7448ca8a74653f0 (diff) | |
| parent | 188dad47cacac62e9404dd9738722ae824189fe6 (diff) | |
| download | nixpkgs-40299257cca9008c8f676f92b948cd53e02de90a.tar nixpkgs-40299257cca9008c8f676f92b948cd53e02de90a.tar.gz nixpkgs-40299257cca9008c8f676f92b948cd53e02de90a.tar.bz2 nixpkgs-40299257cca9008c8f676f92b948cd53e02de90a.tar.lz nixpkgs-40299257cca9008c8f676f92b948cd53e02de90a.tar.xz nixpkgs-40299257cca9008c8f676f92b948cd53e02de90a.tar.zst nixpkgs-40299257cca9008c8f676f92b948cd53e02de90a.zip | |
Merge branch 'master' into staging-next
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 b5a9f0cc5cb..81313fb390e 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 c62e72f6047..434eadb38bf 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 |