From 2a216f3eb53d7ca7d5f170f4db5bbbefb8ed32e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Fri, 24 Oct 2025 12:12:55 +0200
Subject: [PATCH] nix: fix targets to not be nested under androidPackages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Otherwise this happens:

 > nix flake show
error: expected a derivation

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 flake.nix | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3168f84..a017876 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,24 +47,23 @@
           "libsds-android-arm"
         ];
       in rec {
-        # Generate a package for each target dynamically
-        androidPackages = builtins.listToAttrs (map (t: {
-          name = t;
-          value = pkgs.callPackage ./nix/default.nix {
-            inherit stableSystems;
-            src = self;
-            targets = [ t ];
-          };
-        }) targets);
-
-        # Existing non-Android package
+        # non-Android package
         libsds = pkgs.callPackage ./nix/default.nix {
           inherit stableSystems;
           src = self;
-          targets = ["libsds"];
+          targets = [ "libsds" ];
         };
 
         default = libsds;
-      });
+      }
+      # Generate a package for each target dynamically
+      // builtins.listToAttrs (map (name: {
+        inherit name;
+        value = pkgs.callPackage ./nix/default.nix {
+          inherit stableSystems;
+          src = self;
+          targets = [ name ];
+        };
+      }) targets));
     };
 }