Simplify nix flake

Signed-off-by: Matthias J. Kannwischer <[email protected]>

Author: mkannwischer

Makefile

@@ -24,8 +24,8 @@ SHELL := /bin/bash
 
 all: build
 
+# Target platform for baremetal targets
 TARGET_PLATFORM ?=
-SOURCES=
 ifneq ($(TARGET_PLATFORM),)
 include test/mk/platform.mk
 endif

flake.nix

@@ -73,10 +73,6 @@
           packages.toolchain_ppc64le = util.toolchain_ppc64le;
           packages.toolchain_aarch64_be = util.toolchain_aarch64_be;
 
-          # Build: Cortex-M55 (AN547) using arm-none-eabi-gcc, platform files from pqmx
-          packages.m55-an547 = util.m55-an547;
-          packages.default = config.packages.m55-an547;
-
           devShells.default = util.mkShell {
             packages = builtins.attrValues
               {
@@ -87,6 +83,9 @@
                   zig_0_13;
               } ++ pkgs.lib.optionals (!pkgs.stdenv.isDarwin) [ config.packages.valgrind_varlat ];
           };
+
+          # Build: Cortex-M55 (AN547) using arm-none-eabi-gcc, platform files from pqmx
+          packages.m55-an547 = util.m55-an547;
           devShells.arm-embedded = util.mkShell {
             packages = builtins.attrValues
               {

nix/m55-an547-arm-none-eabi/default.nix

@@ -4,14 +4,9 @@
 { stdenvNoCC
 , fetchFromGitHub
 , writeText
-, ...
 }:
 
-# Builds mldsa-native for Cortex-M55 (AN547) using arm-none-eabi-gcc.
-# It fetches the platform support files from slothy-optimizer/pqmx
-# instead of using copies in the repository.
-
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation {
   pname = "mldsa-native-m55-an547";
   version = "unstable-2025-09-17";
 
@@ -25,25 +20,19 @@ stdenvNoCC.mkDerivation rec {
   };
 
   patches = [ ./semihosting.patch ];
-
-  buildPhase = ''
-    runHook preBuild
-    runHook postBuild
-  '';
+  dontBuild = true;
 
   installPhase = ''
-    runHook preInstall
-    mkdir -p "$out"/platform/m55-an547/src/platform/
-    cp -ru envs/m55-an547/src/platform/. "$out"/platform/m55-an547/src/platform/
-    runHook postInstall
+    mkdir -p $out/platform/m55-an547/src/platform/
+    cp -r envs/m55-an547/src/platform/. $out/platform/m55-an547/src/platform/
   '';
 
   setupHook = writeText "setup-hook.sh" ''
     export M55_AN547_PATH="$1/platform/m55-an547/src/platform/"
   '';
 
   meta = {
-    description = "Build of mldsa-native for Cortex-M55 (AN547) using arm-none-eabi-gcc";
-    homepage = "https://github.com/slothy-optimizer/pqm4-mx";
+    description = "Platform files for the Cortex-M55 (AN547)";
+    homepage = "https://github.com/slothy-optimizer/pqmx";
   };
 }