mirror of
https://github.com/logos-messaging/nim-sds.git
synced 2026-01-07 08:33:07 +00:00
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 <jakub@status.im>
This commit is contained in:
parent
f3b084103d
commit
2a216f3eb5
25
flake.nix
25
flake.nix
@ -47,24 +47,23 @@
|
|||||||
"libsds-android-arm"
|
"libsds-android-arm"
|
||||||
];
|
];
|
||||||
in rec {
|
in rec {
|
||||||
# Generate a package for each target dynamically
|
# non-Android package
|
||||||
androidPackages = builtins.listToAttrs (map (t: {
|
|
||||||
name = t;
|
|
||||||
value = pkgs.callPackage ./nix/default.nix {
|
|
||||||
inherit stableSystems;
|
|
||||||
src = self;
|
|
||||||
targets = [ t ];
|
|
||||||
};
|
|
||||||
}) targets);
|
|
||||||
|
|
||||||
# Existing non-Android package
|
|
||||||
libsds = pkgs.callPackage ./nix/default.nix {
|
libsds = pkgs.callPackage ./nix/default.nix {
|
||||||
inherit stableSystems;
|
inherit stableSystems;
|
||||||
src = self;
|
src = self;
|
||||||
targets = ["libsds"];
|
targets = [ "libsds" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
default = 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));
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user