melody/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-07-08 14:20:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

style: Run statix

Browse source
This commit is contained in:
Shuroii 2025-07-03 13:11:47 +02:00 • committed by Jade Ellis
parent cb138f5039
commit 6289bcaabc
No known key found for this signature in database
GPG key ID: 8705A2A3EBF77BD2
3 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.nix
View file

@ -43,7 +43,7 @@
pkgs: pkgs:
pkgs.lib.makeScope pkgs.newScope (self: { pkgs.lib.makeScope pkgs.newScope (self: {
inherit pkgs inputs; inherit pkgs inputs;
craneLib = ((inputs.crane.mkLib pkgs).overrideToolchain (_: toolchain)); craneLib = (inputs.crane.mkLib pkgs).overrideToolchain (_: toolchain);
main = self.callPackage ./nix/pkgs/main { }; main = self.callPackage ./nix/pkgs/main { };
liburing = pkgs.liburing.overrideAttrs { liburing = pkgs.liburing.overrideAttrs {
# Tests weren't building # Tests weren't building
@ -58,7 +58,7 @@
(pkgs.rocksdb_9_10.override { (pkgs.rocksdb_9_10.override {
# Override the liburing input for the build with our own so # Override the liburing input for the build with our own so
# we have it built with the library flag # we have it built with the library flag
liburing = self.liburing; inherit (self) liburing;
}).overrideAttrs }).overrideAttrs
(old: { (old: {
src = inputs.rocksdb; src = inputs.rocksdb;
@ -218,9 +218,7 @@
{ {
name = "${binaryName}-x86_64-haswell-optimised"; name = "${binaryName}-x86_64-haswell-optimised";
value = scopeCrossStatic.main.override { value = scopeCrossStatic.main.override {
x86_64_haswell_target_optimised = ( x86_64_haswell_target_optimised = if (crossSystem == "x86_64-linux-gnu" || crossSystem == "x86_64-linux-musl") then true else false;
if (crossSystem == "x86_64-linux-gnu" || crossSystem == "x86_64-linux-musl") then true else false
);
}; };
} }
@ -290,9 +288,7 @@
# conduwuit_mods is a development-only hot reload feature # conduwuit_mods is a development-only hot reload feature
"conduwuit_mods" "conduwuit_mods"
]; ];
x86_64_haswell_target_optimised = ( x86_64_haswell_target_optimised = if (crossSystem == "x86_64-linux-gnu" || crossSystem == "x86_64-linux-musl") then true else false;
if (crossSystem == "x86_64-linux-gnu" || crossSystem == "x86_64-linux-musl") then true else false
);
}; };
} }

7
nix/pkgs/main/cross-compilation-env.nix
View file

@ -13,12 +13,7 @@ lib.optionalAttrs stdenv.hostPlatform.isStatic
CARGO_BUILD_RUSTFLAGS = CARGO_BUILD_RUSTFLAGS =
lib.concatStringsSep lib.concatStringsSep
" " " "
([ ] (lib.optionals
# This disables PIE for static builds, which isn't great in terms
# of security. Unfortunately, my hand is forced because nixpkgs'
# `libstdc++.a` is built without `-fPIE`, which precludes us from
# leaving PIE enabled.
++ lib.optionals
stdenv.hostPlatform.isStatic stdenv.hostPlatform.isStatic
[ "-C" "relocation-model=static" ] [ "-C" "relocation-model=static" ]
++ lib.optionals ++ lib.optionals

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

@ -93,16 +93,16 @@ let
# for some reason enableLiburing in nixpkgs rocksdb is default true # for some reason enableLiburing in nixpkgs rocksdb is default true
# which breaks Darwin entirely # which breaks Darwin entirely
enableLiburing = enableLiburing; inherit enableLiburing;
}).overrideAttrs (old: { }).overrideAttrs (old: {
enableLiburing = enableLiburing; inherit enableLiburing;
cmakeFlags = (if x86_64_haswell_target_optimised then cmakeFlags = (if x86_64_haswell_target_optimised then
(lib.subtractLists [ (lib.subtractLists [
# dont make a portable build if x86_64_haswell_target_optimised is enabled # dont make a portable build if x86_64_haswell_target_optimised is enabled
"-DPORTABLE=1" "-DPORTABLE=1"
] ]
old.cmakeFlags old.cmakeFlags
++ [ "-DPORTABLE=haswell" ]) else ([ "-DPORTABLE=1" ]) ++ [ "-DPORTABLE=haswell" ]) else [ "-DPORTABLE=1" ]
) )
++ old.cmakeFlags; ++ old.cmakeFlags;