harald/nixsgx
1
0
Fork 0
mirror of https://github.com/matter-labs/nixsgx.git synced 2025-07-21 23:43:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: update to nixos 24.05

Browse source 
Signed-off-by: Harald Hoyer <harald@matterlabs.dev>
This commit is contained in:
Harald Hoyer 2024-06-05 15:22:47 +02:00
parent 74a45f2eb2
commit ea5b94f682
Signed by: harald
GPG key ID: F519A1143B3FBE32
6 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/sgx-sdk/default.nix
View file

@ -224,7 +224,7 @@ stdenv.mkDerivation rec {
preFixup = ''
echo "Strip sgxsdk prefix"
for path in "$out/share/bin/environment" "$out/bin/sgx-gdb"; do
substituteInPlace $path --replace "$TMPDIR/sgxsdk" "$out"
substituteInPlace $path --replace-fail "$TMPDIR/sgxsdk" "$out"
done
echo "Fixing pkg-config files"
@ -232,7 +232,7 @@ stdenv.mkDerivation rec {
echo "Fixing SGX_SDK default in samples"
substituteInPlace $out/share/SampleCode/LocalAttestation/buildenv.mk \
--replace '/opt/intel/sgxsdk' "$out"
--replace-fail '/opt/intel/sgxsdk' "$out"
for file in $out/share/SampleCode/*/Makefile; do
substituteInPlace $file \
--replace '/opt/intel/sgxsdk' "$out"
@ -240,11 +240,11 @@ stdenv.mkDerivation rec {
echo "Fixing BINUTILS_DIR in buildenv.mk"
substituteInPlace $out/share/bin/buildenv.mk \
--replace 'BINUTILS_DIR ?= /usr/local/bin' \
--replace-fail 'BINUTILS_DIR ?= /usr/local/bin' \
'BINUTILS_DIR ?= ${BINUTILS_DIR}'
echo "Fixing GDB path in bin/sgx-gdb"
substituteInPlace $out/bin/sgx-gdb --replace '/usr/local/bin/gdb' '${gdb}/bin/gdb'
substituteInPlace $out/bin/sgx-gdb --replace-fail '/usr/local/bin/gdb' '${gdb}/bin/gdb'
'';
doInstallCheck = true;