From 056d26c08480ad410b29f9e9150459c70f8fd7c8 Mon Sep 17 00:00:00 2001 From: Antoine 'toinux' Wam Date: Sun, 29 Dec 2024 14:18:29 +0100 Subject: [PATCH] nixel: 4.1.0 -> 5.1.1 + Fix rust crate::ffi clang 18 compatibility by downgrading to 16 --- pkgs/by-name/ni/nixel/package.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ni/nixel/package.nix b/pkgs/by-name/ni/nixel/package.nix index 7a99a8ec3ac19f..d2820968e9d004 100644 --- a/pkgs/by-name/ni/nixel/package.nix +++ b/pkgs/by-name/ni/nixel/package.nix @@ -3,22 +3,32 @@ rustPlatform, fetchFromGitHub, nix-update-script, + clang_16, testers, nixel, }: - -rustPlatform.buildRustPackage rec { +let + clang = clang_16; + rustPlatform' = rustPlatform // { + bindgenHook = rustPlatform.bindgenHook.override { inherit clang; }; + }; +in +rustPlatform'.buildRustPackage rec { pname = "nixel"; - version = "4.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "kamadorueda"; repo = pname; rev = version; - sha256 = "sha256-dQ3wzBTjteqk9rju+FMAO+ydimnGu24Y2DEDLX/P+1A="; + sha256 = "sha256-wIXZd8iujLqbgbV+abWmIfjDgQ8i6nyE5jTAs3OczXM="; }; - cargoHash = "sha256-1OsHs0W3ji9Kgpv7nGY9XyGxJ4c0faN2VuFLsdwkgKY="; + cargoHash = "sha256-GJ2UO8MvujRxFjzdt2Tfrlfzv1jot9XCrmfBqTFVngI="; + + nativeBuildInputs = [ + rustPlatform'.bindgenHook # .override { clang = clang_16; } + ]; # Package requires a non reproducible submodule # https://github.com/kamadorueda/nixel/blob/2873bd84bf4fc540d0ae8af062e109cc9ad40454/.gitmodules#L7