Skip to content

Commit 615ff2d

Browse files
committed
nix: fix targets to not be nested under androidPackages
Otherwise this happens: > nix flake show error: expected a derivation Signed-off-by: Jakub Sokołowski <[email protected]>
1 parent cbcfa53 commit 615ff2d

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

flake.nix

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,23 @@
4747
"libsds-android-arm"
4848
];
4949
in rec {
50-
# Generate a package for each target dynamically
51-
androidPackages = builtins.listToAttrs (map (t: {
52-
name = t;
53-
value = pkgs.callPackage ./nix/default.nix {
54-
inherit stableSystems;
55-
src = self;
56-
targets = [ t ];
57-
};
58-
}) targets);
59-
60-
# Existing non-Android package
50+
# non-Android package
6151
libsds = pkgs.callPackage ./nix/default.nix {
6252
inherit stableSystems;
6353
src = self;
64-
targets = ["libsds"];
54+
targets = [ "libsds" ];
6555
};
6656

6757
default = libsds;
68-
});
58+
}
59+
# Generate a package for each target dynamically
60+
// builtins.listToAttrs (map (name: {
61+
inherit name;
62+
value = pkgs.callPackage ./nix/default.nix {
63+
inherit stableSystems;
64+
src = self;
65+
targets = [ name ];
66+
};
67+
}) targets));
6968
};
7069
}

0 commit comments

Comments
 (0)