File tree Expand file tree Collapse file tree 2 files changed +20
-4
lines changed Expand file tree Collapse file tree 2 files changed +20
-4
lines changed Original file line number Diff line number Diff line change 30
30
# stdenv as the original drv (important to determine targetPlatform).
31
31
drv . stdenv . mkDerivation {
32
32
name = "${ exe } " ;
33
- phases = [ "buildPhase" ] ;
33
+ buildInputs = [ pkgs . cctools ] ;
34
+ phases = [ "buildPhase" "postFixup" ] ;
34
35
buildPhase = ''
35
36
set -e
36
37
46
47
sed 's/${ placeholder } /${ rev } /' ${ drv } /bin/${ exe } > $out/bin/${ exe }
47
48
chmod +x $out/bin/${ exe }
48
49
'' ;
50
+ postFixup = ''
51
+ install_name_tool -add_rpath ${ pkgs . zlib } /lib $out/bin/${ exe }
52
+ install_name_tool -add_rpath ${ pkgs . lmdb } /lib $out/bin/${ exe }
53
+ install_name_tool -add_rpath ${ pkgs . libcxx } /lib $out/bin/${ exe }
54
+ install_name_tool -add_rpath ${ pkgs . libiconv } /lib $out/bin/${ exe }
55
+ install_name_tool -add_rpath ${ pkgs . libffi } /lib $out/bin/${ exe }
56
+ '' ;
49
57
} ;
50
58
51
59
nativePkgs = hsPkgs ;
Original file line number Diff line number Diff line change 45
45
hydra-tx . writeHieFiles = true ;
46
46
hydra-tui . writeHieFiles = true ;
47
47
hydraw . writeHieFiles = true ;
48
- hydra-node . dontStrip = false ;
49
- hydra-tui . dontStrip = false ;
50
- hydraw . dontStrip = false ;
48
+ # NOTE: This is needed to fix the "Killed: 9" error on macOS aarch64
49
+ # where the executable is being killed by the OS.
50
+ # See also: https://github.com/NixOS/nixpkgs/issues/112296
51
+ hydra-node . dontStrip = true ;
52
+ hydra-tui . dontStrip = true ;
53
+ hydraw . dontStrip = true ;
51
54
} ;
52
55
}
53
56
# Use different static libs on darwin
90
93
{
91
94
packages . hydra-node . components . library . build-tools = [ pkgs . etcd ] ;
92
95
}
96
+ {
97
+ packages . hydra-node . components . exes . hydra-node . preCheck = ''
98
+ export HOME=$(mktemp -d)
99
+ '' ;
100
+ }
93
101
] ;
94
102
} ;
95
103
You can’t perform that action at this time.
0 commit comments