magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix: try bumping to latest complement

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-12-09 12:31:08 -05:00
parent faf48405aa
commit e1bd6a7c2d
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -120,11 +120,11 @@
"complement": { "complement": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1724347376, "lastModified": 1732612157,
"narHash": "sha256-y0e/ULDJ92IhNQZsS/06g0s+AYZ82aJfrIO9qEse94c=", "narHash": "sha256-uqQfVmwCUrsw7eHs9przqnhMoyx4r7WUU8AWfT2Buo4=",
"owner": "matrix-org", "owner": "matrix-org",
"repo": "complement", "repo": "complement",
"rev": "39733c1b2f8314800776748cc7164f9a34650686", "rev": "fc63446512261a496b794a7082a6598b6f98e925",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
flake.nix
View file

@ -18,7 +18,6 @@
let let
pkgsHost = import inputs.nixpkgs{ pkgsHost = import inputs.nixpkgs{
inherit system; inherit system;
config.permittedInsecurePackages = [ "olm-3.2.16" ];
}; };
pkgsHostStatic = pkgsHost.pkgsStatic; pkgsHostStatic = pkgsHost.pkgsStatic;
@ -118,9 +117,9 @@
# code. # code.
COMPLEMENT_SRC = inputs.complement.outPath; COMPLEMENT_SRC = inputs.complement.outPath;
# Needed for Complement # Needed for Complement: <https://github.com/golang/go/issues/52690>
CGO_CFLAGS = "-I${scope.pkgs.olm}/include"; CGO_CFLAGS = "-Wl,--no-gc-sections";
CGO_LDFLAGS = "-L${scope.pkgs.olm}/lib"; CGO_LDFLAGS = "-Wl,--no-gc-sections";
}; };
# Development tools # Development tools

2
nix/pkgs/main/default.nix
View file

@ -176,7 +176,7 @@ commonAttrs = {
# #
# <https://github.com/input-output-hk/haskell.nix/issues/829> # <https://github.com/input-output-hk/haskell.nix/issues/829>
postInstall = with pkgsBuildHost; '' postInstall = with pkgsBuildHost; ''
find "$out" -type f -exec remove-references-to -t ${stdenv.cc} -t ${gcc} -t ${libgcc} -t ${llvm} -t ${libllvm} -t ${rustc.unwrapped} -t ${rustc} -t ${libidn2} -t ${libunistring} '{}' + find "$out" -type f -exec remove-references-to -t ${stdenv.cc} -t ${gcc} -t ${llvm} -t ${rustc.unwrapped} -t ${rustc} '{}' +
''; '';
}; };
in in