death916/nixconfig
1
0
Fork 0
mirror of https://github.com/Death916/nixconfig.git synced 2026-04-10 02:54:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

hash

Browse source
This commit is contained in:
death916 2025-05-14 08:11:25 -07:00
parent 52f3b5455a
commit db004f1d86
1 changed files with 20 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

59
overlays/halloy-overlay.nix
View file

@ -1,26 +1,10 @@
self: super: {
# First create a patched version of cryoglyph
cryoglyph = super.rustPlatform.buildRustPackage rec {
pname = "cryoglyph";
version = "0.1.0";
src = super.fetchFromGitHub {
owner = "iced-rs";
repo = "cryoglyph";
rev = "a456d1c17bbcf33afcca41d9e5e299f9f1193819"; # Get this from Halloy's Cargo.lock
sha256 = "sha256-X7S9jq8wU6g1DDNEzOtP3lKWugDnpopPDBK49iWvD4o=";
};
RUSTC_BOOTSTRAP = 1;
postPatch = ''
sed -i '1i cargo-features = ["edition2024"]' Cargo.toml
'';
cargoHash = "sha256-0000000000000000000000000000000000000000000000000000"; # Let Nix fill this
self: super:
let
# Pin to a specific nightly that supports edition2024
rustNightly = super.rust-bin.nightly."2025-05-14".default.override {
extensions = [ "rust-src" ];
};
# Now build Halloy with the patched cryoglyph
in {
halloy = super.rustPlatform.buildRustPackage rec {
pname = "halloy";
version = "2025.5";
@ -32,33 +16,30 @@ self: super: {
sha256 = "sha256-cG/B6oiRkyoC5fK7bLdCDQYZymfMZspWXvOkqpwHRPk=";
};
RUSTC_BOOTSTRAP = 1;
# Force use of pinned nightly toolchain
cargo = rustNightly;
rustc = rustNightly;
nativeBuildInputs = with super; [
pkg-config
(rust-bin.nightly."2025-05-14".default.override {
extensions = [ "rust-src" ];
})
];
# Required for edition2024 features
RUSTC_BOOTSTRAP = 1;
# Patch all Cargo.toml files recursively
postPatch = ''
sed -i '1i cargo-features = ["edition2024"]' Cargo.toml
sed -i 's|^cryoglyph = .*|cryoglyph = { path = "${self.cryoglyph.src}" }|' Cargo.toml
find . -name Cargo.toml -exec sed -i '1i cargo-features = ["edition2024"]' {} \;
'';
cargoLock = {
lockFile = super.fetchurl {
url = "https://raw.githubusercontent.com/squidowl/halloy/${version}/Cargo.lock";
sha256 = "sha256-s5e8T+ODhiK/fFH4lIs7SnIZX0unZPqsDIct5cntG8E=";
};
# Use crane's vendor approach for better dependency handling
cargoDeps = super.rustPlatform.importCargoLock {
lockFile = src + "/Cargo.lock";
outputHashes = {
"cryoglyph-0.1.0" = "sha256-X7S9jq8wU6g1DDNEzOtP3lKWugDnpopPDBK49iWvD4o=";
"dark-light-2.0.0" = "sha256-e826vF7iSkGUqv65TXHBUX04Kz2aaJJEW9f7JsAMaXE=";
"iced-0.14.0-dev" = "sha256-FEGk1zkXM9o+fGMoDtmi621G6pL+Yca9owJz4q2Lzks=";
"cryoglyph-0.1.0" = "";
"dpi-0.1.1" = "";
"dpi-0.1.1" = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
};
};
nativeBuildInputs = with super; [ pkg-config ];
buildInputs = with super; [
libxkbcommon