From 0b8308e9d13068e83165cf47a1ab6ceddb68de2e Mon Sep 17 00:00:00 2001
From: Sebastian Wendel <swendel@srx.dev>
Date: Fri, 15 Sep 2023 19:18:25 +0200
Subject: [PATCH] Restore default directory layout

---
 packages/zephyr-sdk/default.nix   | 28 ++--------------------------
 packages/zephyr-sdk/setup-hook.sh |  1 -
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/packages/zephyr-sdk/default.nix b/packages/zephyr-sdk/default.nix
index d6e4aef..ac263ca 100644
--- a/packages/zephyr-sdk/default.nix
+++ b/packages/zephyr-sdk/default.nix
@@ -91,13 +91,6 @@ in
 
     patchPhase = ''
       patchShebangs .
-
-      substituteInPlace cmake/zephyr/host-tools.cmake \
-      	--replace "/usr/share" "/share"								\
-      	--replace "/sysroots/\*-pokysdk-linux" ""
-
-      substituteInPlace cmake/Zephyr-sdkConfig.cmake \
-      	--replace ".. ABSOLUTE" "../.. ABSOLUTE"
     '';
 
     dontConfigure = true;
@@ -106,25 +99,8 @@ in
     installPhase = ''
       runHook preInstall
 
-      mkdir -p $out/{share,lib}
-
-      # remove deprecated symbolic links
-      find ./sysroots/$(uname -m)-pokysdk-linux/usr/bin -type l -exec unlink {} \;
-
-      # add zephyr-sdk standalone hosttools
-      mv ./sysroots/$(uname -m)-pokysdk-linux/usr/{bin,libexec,share} $out/
-      mv ./sysroots/$(uname -m)-pokysdk-linux/usr/synopsys/bin/qemu-system-* $out/bin/
-      mv ./sysroots/$(uname -m)-pokysdk-linux/usr/xilinx/bin/qemu-system-aarch64 \
-      		$out/bin/qemu-system-xilinx-aarch64
-      mv ./sysroots/$(uname -m)-pokysdk-linux/usr/xilinx/bin/qemu-system-microblazeel \
-      		$out/bin/qemu-system-xilinx-microblazeel
-
-      # add zephyr-sdk cmake modules
-      mv ./cmake $out/lib/cmake
-      mv ./sdk_* $out/lib
-
-      # add zephyr-sdk cross compilers
-      mv ./*zephyr*/bin/* $out/bin/
+      mkdir -p $out
+      mv * $out
 
       runHook postInstall
     '';
diff --git a/packages/zephyr-sdk/setup-hook.sh b/packages/zephyr-sdk/setup-hook.sh
index 07b47dc..5d4b29c 100644
--- a/packages/zephyr-sdk/setup-hook.sh
+++ b/packages/zephyr-sdk/setup-hook.sh
@@ -1,7 +1,6 @@
 addZephyrSDKCEnvVars() {
 	export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
 	export ZEPHYR_SDK_INSTALL_DIR=@out@
-	export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:@out@/lib/cmake/
 }
 
 addEnvHooks "$hostOffset" addZephyrSDKCEnvVars