diff --git a/flake.lock b/flake.lock index 6049fded..56675fb0 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "complement": { "flake": false, "locked": { - "lastModified": 1724347376, - "narHash": "sha256-y0e/ULDJ92IhNQZsS/06g0s+AYZ82aJfrIO9qEse94c=", + "lastModified": 1732612157, + "narHash": "sha256-uqQfVmwCUrsw7eHs9przqnhMoyx4r7WUU8AWfT2Buo4=", "owner": "matrix-org", "repo": "complement", - "rev": "39733c1b2f8314800776748cc7164f9a34650686", + "rev": "fc63446512261a496b794a7082a6598b6f98e925", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4eb72731..817f4e6d 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,6 @@ let pkgsHost = import inputs.nixpkgs{ inherit system; - config.permittedInsecurePackages = [ "olm-3.2.16" ]; }; pkgsHostStatic = pkgsHost.pkgsStatic; @@ -118,9 +117,9 @@ # code. COMPLEMENT_SRC = inputs.complement.outPath; - # Needed for Complement - CGO_CFLAGS = "-I${scope.pkgs.olm}/include"; - CGO_LDFLAGS = "-L${scope.pkgs.olm}/lib"; + # Needed for Complement: + CGO_CFLAGS = "-Wl,--no-gc-sections"; + CGO_LDFLAGS = "-Wl,--no-gc-sections"; }; # Development tools diff --git a/nix/pkgs/main/default.nix b/nix/pkgs/main/default.nix index d11c36cc..c40af176 100644 --- a/nix/pkgs/main/default.nix +++ b/nix/pkgs/main/default.nix @@ -176,7 +176,7 @@ commonAttrs = { # # 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