From e74ffcd3665dd61965f6040e6ced86b6f9804389 Mon Sep 17 00:00:00 2001
From: Vincent Haupert <mail@vincent-haupert.de>
Date: Mon, 15 Nov 2021 13:48:23 +0100
Subject: [PATCH] sgx-sdk: rework `installCheckPhase`

---
 pkgs/os-specific/linux/sgx-sdk/default.nix | 31 +++++++++++++---------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/sgx-sdk/default.nix b/pkgs/os-specific/linux/sgx-sdk/default.nix
index 3cda94c73862..28af8a32a646 100644
--- a/pkgs/os-specific/linux/sgx-sdk/default.nix
+++ b/pkgs/os-specific/linux/sgx-sdk/default.nix
@@ -228,25 +228,30 @@ stdenv.mkDerivation rec {
   installCheckPhase = ''
     runHook preInstallCheck
 
+    header "Building and running SGX samples"
+
     source $out/share/bin/environment
 
-    TESTDIR=`mktemp -d`
-    cp -r $out/share/SampleCode $TESTDIR/
+    TESTDIR=$(mktemp -d)
+    pushd $TESTDIR
 
-    for dir in "Cxx11SGXDemo" "SampleEnclave" "SampleEnclavePCL" "SealUnseal" "Switchless"; do
-      cd $TESTDIR/SampleCode/$dir/
-      make SGX_MODE=SIM
-      ./app
+    cp -r $out/share/SampleCode/. ./
+
+    for dir in "Cxx11SGXDemo" "LocalAttestation" "SampleEnclave" "SampleEnclavePCL" "SealUnseal" "Switchless"; do
+      pushd "$dir/"
+      make -j $NIX_BUILD_CORES SGX_MODE=SIM
+      ./app || ./bin/app
+      popd
     done
 
-    cd $TESTDIR/SampleCode/LocalAttestation
-    make SGX_MODE=SIM
-    cd bin/
-    ./app
-
-    cd $TESTDIR/SampleCode/RemoteAttestation
-    make SGX_MODE=SIM
+    pushd "RemoteAttestation"
+    make -j $NIX_BUILD_CORES SGX_MODE=SIM
     echo "a" | LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/sample_libcrypto ./app
+    popd
+
+    popd
+
+    header "Checking symlink targets"
 
     # Make sure all symlinks are valid
     output=$(find "$out" -type l -exec test ! -e {} \; -print)