b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

darwin.stdenv: fix portable libsystem hook with sandboxing

Browse source 
When sandboxing is enabled, the hook tries to run `install_name_tool`
and fails because the system one is inaccessible. Having it use
`targetPrefix` allows it to find and use the cross-install_name_tool.
This commit is contained in:
Randy Eckenrode 2023-07-08 18:57:24 -06:00
parent 94c52940c4
commit feb89eed00
No known key found for this signature in database
GPG key ID: 64C1CD4EC2A600D9
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/stdenv/adapters.nix
View file

@ -105,6 +105,7 @@ rec {
name = "darwin-portable-libSystem-hook"; name = "darwin-portable-libSystem-hook";
substitutions = { substitutions = {
libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib";
targetPrefix = stdenv.cc.bintools.targetPrefix;
}; };
} ./darwin/portable-libsystem.sh) } ./darwin/portable-libsystem.sh)
]; ];

2
pkgs/stdenv/darwin/portable-libsystem.sh
View file

@ -7,6 +7,6 @@ fixupOutputHooks+=('fixLibsystemRefs $prefix')
fixLibsystemRefs() { fixLibsystemRefs() {
if [ -d "$1/bin" ]; then if [ -d "$1/bin" ]; then
find "$1/bin" -exec \ find "$1/bin" -exec \
install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \; @targetPrefix@install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \;
fi fi
} }