git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-07-09 14:06:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

set C/LDFLAGS for complement dependencies directly

Browse source 
Previously we were relying on NIX_CFLAGS_COMPILE, but this is not being
set in static devshells. A cleaner solution for complement would likely
be to build the tests in their own nix derivation instead of building
them in the devshell, but this change unblocks CI for now.
This commit is contained in:
Benjamin Lee 2024-05-23 23:48:28 -07:00
parent 9e9ff64d0e
commit 5c4cc43650
No known key found for this signature in database
GPG key ID: FB9624E2885D55A4
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
flake.nix
View file

@ -56,6 +56,10 @@
# Convenient way to access a pinned version of Complement's source # Convenient way to access a pinned version of Complement's source
# code. # code.
COMPLEMENT_SRC = inputs.complement.outPath; COMPLEMENT_SRC = inputs.complement.outPath;
# Needed for Complement
CGO_CFLAGS = "-I${scope.pkgs.olm}/include";
CGO_LDFLAGS = "-L${scope.pkgs.olm}/lib";
}; };
# Development tools # Development tools
@ -77,7 +81,6 @@
# Needed for Complement # Needed for Complement
go go
olm
# Needed for our script for Complement # Needed for our script for Complement
jq jq