build: fix nix support, update flake
This commit is contained in:
parent
6d087046b8
commit
1f9ac58baa
3 changed files with 19 additions and 20 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1,3 +1,5 @@
|
||||||
/bin
|
/bin
|
||||||
/obj
|
/obj
|
||||||
config.ini
|
config.ini
|
||||||
|
|
||||||
|
/result
|
||||||
|
|
|
||||||
29
flake.lock
generated
29
flake.lock
generated
|
|
@ -3,35 +3,32 @@
|
||||||
"beaker-src": {
|
"beaker-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775244490,
|
"lastModified": 1790704008,
|
||||||
"narHash": "sha256-4TJv7X6D0l4rEbTRKf47gU43L8G5uJgxxtsqMkVixQY=",
|
"narHash": "sha256-Al/BE7uVRSmUGF/t1m0pWxF9jNgzdCVUrc5ZHkcPiQg=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "3fab89ecf8f4c664477a82add660d28db87357b4",
|
"rev": "10be7f581fb828e74f064ea7ad4fb0534ee8540a",
|
||||||
"revCount": 27,
|
"revCount": 46,
|
||||||
"shallow": false,
|
"shallow": false,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.bwaaa.monster/beaker"
|
"url": "https://git.bwaaa.space/beaker"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"shallow": false,
|
"shallow": false,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.bwaaa.monster/beaker"
|
"url": "https://git.bwaaa.space/beaker"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773734432,
|
"lastModified": 1791456040,
|
||||||
"narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
|
"narHash": "sha256-gRZ/s8WQJ2CsXdhcDVQH34qxuL0MuMCOs3aBiK1Prsw=",
|
||||||
"owner": "NixOS",
|
"rev": "e7439b6b14ad3cc35d05608ebca9bce01a25f5f8",
|
||||||
"repo": "nixpkgs",
|
"type": "tarball",
|
||||||
"rev": "cda48547b432e8d3b18b4180ba07473762ec8558",
|
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1087755.e7439b6b14ad/nixexprs.tar.zst?lastModified=1791456040&rev=e7439b6b14ad3cc35d05608ebca9bce01a25f5f8"
|
||||||
"type": "github"
|
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"type": "tarball",
|
||||||
"ref": "nixos-unstable",
|
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst"
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst";
|
||||||
beaker-src = {
|
beaker-src = {
|
||||||
url = "git+https://git.bwaaa.monster/beaker?shallow=0";
|
url = "git+https://git.bwaaa.space/beaker?shallow=0";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
makeFlagsArray+=(
|
makeFlagsArray+=(
|
||||||
"PREFIX=$out"
|
"PREFIX=$out"
|
||||||
"CFLAGS=-Wall -Wextra -O2 -Isrc -I${pkgs.libxml2.dev}/include/libxml2"
|
"CFLAGS=-Wall -Wextra -O2 -Isrc -I${pkgs.libxml2.dev}/include/libxml2 -I${beaker}/include/beaker.h"
|
||||||
"LIBS=-lbeaker -lcurl -lxml2 -lpthread -lm -lssl -lcrypto"
|
"LIBS=-lbeaker -lcurl -lxml2 -lpthread -lm -lssl -lcrypto"
|
||||||
)
|
)
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue