logos-messaging/logos-messaging-nim
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-nim.git synced 2026-01-08 00:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

nix: fix package targets in the flake

Browse Source 
Signed-off-by: markoburcul <marko@status.im>
This commit is contained in:
Marko Burčul 2025-02-25 18:57:53 +01:00
parent c04d74468f
commit 1f94e10208
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock generated
View File

@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1735563628, "lastModified": 1740339700,
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

25
flake.nix
View File

@ -2,7 +2,7 @@
description = "NWaku build flake"; description = "NWaku build flake";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
zerokit = { zerokit = {
url = "github:vacp2p/zerokit?rev=4479810968b88d0ef92717524adf5edd23df1869"; url = "github:vacp2p/zerokit?rev=4479810968b88d0ef92717524adf5edd23df1869";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -13,6 +13,9 @@
let let
stableSystems = [ stableSystems = [
"x86_64-linux" "aarch64-linux" "x86_64-linux" "aarch64-linux"
"x86_64-darwin" "aarch64-darwin"
"x86_64-windows" "i686-linux"
"i686-windows"
]; ];
forAllSystems = f: nixpkgs.lib.genAttrs stableSystems (system: f system); forAllSystems = f: nixpkgs.lib.genAttrs stableSystems (system: f system);
@ -36,14 +39,20 @@
in rec { in rec {
packages = forAllSystems (system: let packages = forAllSystems (system: let
buildTarget = targets: pkgsFor.${system}.callPackage ./nix/default.nix { pkgs = pkgsFor.${system};
inherit stableSystems;
src = self;
zerokitPkg = zerokit.packages.x86_64-linux.default;
androidArch = "aarch64-linux-android";
};
in rec { in rec {
libwaku-android-arm64 = buildTarget "libwaku-android-arm64"; libwaku-android-arm64 = pkgs.callPackage ./nix/default.nix {
inherit stableSystems;
targets = ["libwaku-android-arm64"];
androidArch = "aarch64-linux-android";
zerokitPkg = zerokit.packages.${system}.zerokit-android-arm64;
};
libwaku-android-amd64 = pkgs.callPackage ./nix/default.nix {
inherit stableSystems;
targets = ["libwaku-android-amd64"];
androidArch = "musl64";
zerokitPkg = zerokit.packages.${system}.zerokit-android-amd64;
};
default = libwaku-android-arm64; default = libwaku-android-arm64;
}); });

8
nix/default.nix
View File

@ -2,7 +2,7 @@
config ? {}, config ? {},
pkgs ? import ./pkgs.nix { inherit config; }, pkgs ? import ./pkgs.nix { inherit config; },
src ? ../., src ? ../.,
targets ? ["libwaku-android-amd64"], targets ? ["libwaku-android-arm64"],
verbosity ? 2, verbosity ? 2,
useSystemNim ? false, useSystemNim ? false,
stableSystems ? [ stableSystems ? [
@ -49,7 +49,6 @@ in stdenv.mkDerivation rec {
which which
lsb-release lsb-release
zerokitPkg zerokitPkg
nim-unwrapped-2_0
fakeGit fakeGit
fakeCargo fakeCargo
fakeRustup fakeRustup
@ -73,11 +72,6 @@ in stdenv.mkDerivation rec {
preBuild = '' preBuild = ''
ln -s waku.nimble waku.nims ln -s waku.nimble waku.nims
mkdir -p ./vendor/nimbus-build-system/vendor/Nim/bin/nim
USE_SYSTEM_NIM=1 ./vendor/nimbus-build-system/scripts/env.sh nim c vendor/nph/src/nph.nim
mv vendor/nph/src/nph ./vendor/nimbus-build-system/vendor/Nim/bin/nim
pushd vendor/nimbus-build-system/vendor/Nim pushd vendor/nimbus-build-system/vendor/Nim
mkdir dist mkdir dist
cp -r ${callPackage ./nimble.nix {}} dist/nimble cp -r ${callPackage ./nimble.nix {}} dist/nimble