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

upstream nix changes, make rocksdb git work

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-01-26 19:15:52 -05:00 • committed by June
parent 35ebc459fa
commit 331b63ca40
2 changed files with 21 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -73,11 +73,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1706163833, "lastModified": 1706250153,
"narHash": "sha256-Vw+jTVtKceT+ScaIn7tHy8JjRZZpmg2fAdoInLAsW/M=", "narHash": "sha256-OwEZ4UMLuz9fpH9ZbN7SSQvtDvUoj3RV32icp+8SIIc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "043f63f55e9c9b808852ea82edee1f2a1af37e91", "rev": "6d85102211fa954ece0a8a898ed91b4866b62ce7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,11 +184,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1705856552, "lastModified": 1706191920,
"narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,11 +211,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1706106882, "lastModified": 1706158176,
"narHash": "sha256-31DivWu0cC50gR2CgbGtLCf77nuiw4kdiI7B8ioqzLw=", "narHash": "sha256-qPiPcLBXU05j+Z2hCrtClJQfmrfSN/bUq2aODiCzde0=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "0d52934d19d7addcafcfda92a1d547b51556beec", "rev": "38f7a3498e0d5f0113294bbdc08f867cd527e65f",
"type": "github" "type": "github"
}, },
"original": { "original": {

34
flake.nix
View file

@ -8,7 +8,6 @@
url = "github:nix-community/fenix"; url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
crane = { crane = {
# TODO: Switch back to upstream after [this issue][0] is fixed # TODO: Switch back to upstream after [this issue][0] is fixed
# #
@ -30,27 +29,15 @@
, ... , ...
}: flake-utils.lib.eachDefaultSystem (system: }: flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = import nixpkgs { rocksdb' = pkgs: pkgs.rocksdb.overrideAttrs (old:
inherit system;
overlays = [
(final: prev: {
rocksdb = prev.rocksdb.overrideAttrs (old:
let
version = "8.10.0";
in
{ {
inherit version;
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "rocksdb"; repo = "rocksdb";
rev = "v${version}"; rev = "v8.10.0";
hash = "sha256-KGsYDBc1fz/90YYNGwlZ0LUKXYsP1zyhP29TnRQwgjQ="; hash = "sha256-KGsYDBc1fz/90YYNGwlZ0LUKXYsP1zyhP29TnRQwgjQ=";
}; };
}); });
})
];
};
pkgsHost = nixpkgs.legacyPackages.${system}; pkgsHost = nixpkgs.legacyPackages.${system};
@ -76,8 +63,8 @@
]; ];
env = pkgs: { env = pkgs: {
ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb}/include"; ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include";
ROCKSDB_LIB_DIR = "${pkgs.rocksdb}/lib"; ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
} }
// pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isStatic { // pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isStatic {
ROCKSDB_STATIC = ""; ROCKSDB_STATIC = "";
@ -93,7 +80,7 @@
stdenv.hostPlatform.isStatic stdenv.hostPlatform.isStatic
["-C" "relocation-model=static"] ["-C" "relocation-model=static"]
++ lib.optionals ++ lib.optionals
(stdenv.buildPlatform.config != pkgs.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
@ -102,10 +89,13 @@
# #
# [0]: https://github.com/NixOS/nixpkgs/blob/612f97239e2cc474c13c9dafa0df378058c5ad8d/pkgs/build-support/rust/lib/default.nix#L36-L39 # [0]: https://github.com/NixOS/nixpkgs/blob/612f97239e2cc474c13c9dafa0df378058c5ad8d/pkgs/build-support/rust/lib/default.nix#L36-L39
( (
pkgs.stdenv.hostPlatform.isAarch64 # Nixpkgs doesn't check for x86_64 here but we do, because I
&& pkgs.stdenv.hostPlatform.isStatic # observed a failure building statically for x86_64 without
&& !pkgs.stdenv.isDarwin # including it here. Linkers are weird.
&& !pkgs.stdenv.cc.bintools.isLLVM (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isx86_64)
&& stdenv.hostPlatform.isStatic
&& !stdenv.isDarwin
&& !stdenv.cc.bintools.isLLVM
) )
[ [
"-l" "-l"