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

format flake, use rust-rocksdb fork

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-03-09 15:45:27 -05:00 • committed by June
parent 4d4c2cf5f8
commit cd2f00e012
1 changed files with 66 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

23
flake.nix
View file

@ -37,10 +37,16 @@
let let
pkgsHost = nixpkgs.legacyPackages.${system}; pkgsHost = nixpkgs.legacyPackages.${system};
rocksdb' = pkgs: pkgs.rocksdb.overrideAttrs (old: rocksdb' = pkgs:
{ let
version = "8.10.0"; version = "8.11.3";
src = old.src.override { in
pkgs.rocksdb.overrideAttrs (old: {
inherit version;
src = pkgs.fetchFromGitHub {
owner = "facebook";
repo = "rocksdb";
rev = "v${version}";
hash = "sha256-KGsYDBc1fz/90YYNGwlZ0LUKXYsP1zyhP29TnRQwgjQ="; hash = "sha256-KGsYDBc1fz/90YYNGwlZ0LUKXYsP1zyhP29TnRQwgjQ=";
}; };
}); });
@ -75,17 +81,17 @@
} }
// { // {
CARGO_BUILD_RUSTFLAGS = let inherit (pkgs) lib stdenv; in CARGO_BUILD_RUSTFLAGS = let inherit (pkgs) lib stdenv; in
lib.concatStringsSep " " ([] lib.concatStringsSep " " ([ ]
++ lib.optionals ++ lib.optionals
# This disables PIE for static builds, which isn't great in terms # This disables PIE for static builds, which isn't great in terms
# of security. Unfortunately, my hand is forced because nixpkgs' # of security. Unfortunately, my hand is forced because nixpkgs'
# `libstdc++.a` is built without `-fPIE`, which precludes us from # `libstdc++.a` is built without `-fPIE`, which precludes us from
# leaving PIE enabled. # leaving PIE enabled.
stdenv.hostPlatform.isStatic stdenv.hostPlatform.isStatic
["-C" "relocation-model=static"] [ "-C" "relocation-model=static" ]
++ lib.optionals ++ lib.optionals
(stdenv.buildPlatform.config != stdenv.hostPlatform.config) (stdenv.buildPlatform.config != stdenv.hostPlatform.config)
["-l" "c"] [ "-l" "c" ]
++ lib.optionals ++ lib.optionals
# This check has to match the one [here][0]. We only need to set # This check has to match the one [here][0]. We only need to set
# these flags when using a different linker. Don't ask me why, # these flags when using a different linker. Don't ask me why,
@ -156,7 +162,8 @@
HOST_CC = "${pkgs.pkgsBuildHost.stdenv.cc}/bin/cc"; HOST_CC = "${pkgs.pkgsBuildHost.stdenv.cc}/bin/cc";
HOST_CXX = "${pkgs.pkgsBuildHost.stdenv.cc}/bin/c++"; HOST_CXX = "${pkgs.pkgsBuildHost.stdenv.cc}/bin/c++";
} }
)); )
);
package = pkgs: builder pkgs { package = pkgs: builder pkgs {
src = nix-filter { src = nix-filter {